OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

arthursv
Melanie 2009-08-05 18:38:42 +01:00
parent 8e58f44040 9e5736eeec
commit b1e7e03390
25 changed files with 16499 additions and 15588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
NANT = $(shell if test "$$EMACS" = "t" ; then echo "nant"; else echo "./nant-color"; fi)
all: prebuild
# @export PATH=/usr/local/bin:$(PATH)

3
OpenSim/Framework/AvatarAppearance.cs
View File

@ -38,8 +38,7 @@ namespace OpenSim.Framework
{
public class AvatarAppearance
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// these are guessed at by the list here -
// http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll

4
OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
View File

@ -90,8 +90,8 @@ namespace OpenSim.Framework.Communications.Tests
TestHelper.InMethod();
// We want to use our own LoginService for this test, one that
// doesn't require authentication.
LoginService loginService = new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", new TestInventoryService(),
m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector);
new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", new TestInventoryService(),
m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector);
Hashtable loginParams = new Hashtable();
loginParams["first"] = m_firstName;

24
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -592,11 +592,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Thread.Sleep(2000);
// Shut down timers
m_clientPingTimer.Stop();
m_avatarTerseUpdateTimer.Stop();
m_primTerseUpdateTimer.Stop();
m_primFullUpdateTimer.Stop();
m_textureRequestTimer.Stop();
if (m_clientPingTimer.Enabled) m_clientPingTimer.Stop();
if (m_avatarTerseUpdateTimer.Enabled) m_avatarTerseUpdateTimer.Stop();
if (m_primTerseUpdateTimer.Enabled) m_primTerseUpdateTimer.Stop();
if (m_primFullUpdateTimer.Enabled) m_primFullUpdateTimer.Stop();
if (m_textureRequestTimer.Enabled) m_textureRequestTimer.Stop();
// This is just to give the client a reasonable chance of
// flushing out all it's packets. There should probably
@ -676,11 +676,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void Stop()
{
// Shut down timers
m_clientPingTimer.Stop();
m_avatarTerseUpdateTimer.Stop();
m_primTerseUpdateTimer.Stop();
m_primFullUpdateTimer.Stop();
m_textureRequestTimer.Stop();
if (m_clientPingTimer.Enabled) m_clientPingTimer.Stop();
if (m_avatarTerseUpdateTimer.Enabled) m_avatarTerseUpdateTimer.Stop();
if (m_primTerseUpdateTimer.Enabled) m_primTerseUpdateTimer.Stop();
if (m_primFullUpdateTimer.Enabled) m_primFullUpdateTimer.Stop();
if (m_textureRequestTimer.Enabled) m_textureRequestTimer.Stop();
}
public void Restart()
@ -3111,7 +3111,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
lock (m_primFullUpdates)
{
if (m_primFullUpdates.Count == 0)
if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled)
{
m_primFullUpdateTimer.Stop();
@ -3159,7 +3159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
outPacket.Header.Zerocoded = true;
OutPacket(outPacket, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority);
if (m_primFullUpdates.Count == 0)
if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled)
m_primFullUpdateTimer.Stop();
}
}

4
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -827,9 +827,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode);
}
}
catch (NullReferenceException n)
catch (NullReferenceException)
{
m_log.Debug("[PACKET] Detected reuse of a returned packet");
m_log.Error("[PACKET]: Detected reuse of a returned packet");
m_PacketQueue.Cancel(item.Sequence);
return;
}

41
OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
View File

@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// </summary>
public class UserTextureDownloadService
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// True if the service has been closed, probably because a user with texture requests still queued
@ -61,22 +60,22 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// currently handle properly as far as I know). However, this situation should be handled in a more
/// sophisticated way.
/// </summary>
private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5;
// private static readonly int MAX_ALLOWED_TEXTURE_REQUESTS = 5;
/// <summary>
/// XXX Also going to limit requests for found textures.
/// </summary>
private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy
= new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
// private readonly IRequestLimitStrategy<UUID> foundTextureLimitStrategy
// = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
private readonly IClientAPI m_client;
// private readonly IClientAPI m_client;
private readonly Scene m_scene;
/// <summary>
/// Texture Senders are placed in this queue once they have received their texture from the asset
/// cache. Another module actually invokes the send.
/// </summary>
private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue;
// private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_sharedSendersQueue;
/// <summary>
/// Holds texture senders before they have received the appropriate texture from the asset cache.
@ -88,15 +87,15 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// XXX This is really a temporary solution to deal with the situation where a client continually requests
/// the same missing textures
/// </summary>
private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy
= new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
// private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy
// = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
public UserTextureDownloadService(
IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue)
{
m_client = client;
// m_client = client;
m_scene = scene;
m_sharedSendersQueue = sharedQueue;
// m_sharedSendersQueue = sharedQueue;
}
/// <summary>
@ -231,16 +230,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
/// Place a ready texture sender on the processing queue.
/// </summary>
/// <param name="textureSender"></param>
private void EnqueueTextureSender(ITextureSender textureSender)
{
textureSender.Cancel = false;
textureSender.Sending = true;
if (!m_sharedSendersQueue.Contains(textureSender))
{
m_sharedSendersQueue.Enqueue(textureSender);
}
}
// private void EnqueueTextureSender(ITextureSender textureSender)
// {
// textureSender.Cancel = false;
// textureSender.Sending = true;
//
// if (!m_sharedSendersQueue.Contains(textureSender))
// {
// m_sharedSendersQueue.Enqueue(textureSender);
// }
// }
/// <summary>
/// Close this module.

25
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary>
/// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
/// </summary>
//[Test]
[Test]
public void TestSaveIarV0_1()
{
TestHelper.InMethod();
@ -264,10 +264,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
}
Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
Assert.That(foundItem, Is.Not.Null);
Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId));
Assert.That(foundItem.CreatorIdAsUuid, Is.EqualTo(user2Uuid));
Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
Assert.That(foundItem, Is.Not.Null, "Didn't find loaded item");
Assert.That(
foundItem.CreatorId, Is.EqualTo(item1.CreatorId),
"Loaded item non-uuid creator doesn't match original");
Assert.That(
foundItem.CreatorIdAsUuid, Is.EqualTo(user2Uuid),
"Loaded item uuid creator doesn't match original");
Assert.That(foundItem.Owner, Is.EqualTo(userUuid),
"Loaded item owner doesn't match inventory reciever");
Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
}
@ -353,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
/// <summary>
/// Test replication of an archive path to the user's inventory.
/// </summary>
//[Test]
[Test]
public void TestReplicateArchivePathToUserInventory()
{
TestHelper.InMethod();
@ -362,6 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
userInfo.FetchInventory();
/*
for (int i = 0 ; i < 50 ; i++)
{
if (userInfo.HasReceivedInventory == true)
@ -369,6 +375,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
Thread.Sleep(200);
}
Assert.That(userInfo.HasReceivedInventory, Is.True, "FetchInventory timed out (10 seconds)");
*/
Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
Dictionary <string, InventoryFolderImpl> foldersCreated = new Dictionary<string, InventoryFolderImpl>();
List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
@ -387,9 +397,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
"{0}{1}/{2}/{3}",
ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemName);
Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
new InventoryArchiveReadRequest(userInfo, null, (Stream)null, null, null)
.ReplicateArchivePathToUserInventory(itemArchivePath, false, userInfo.RootFolder, foldersCreated, nodesLoaded);
Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
Assert.That(folder1, Is.Not.Null, "Could not find folder a");
InventoryFolderImpl folder2 = folder1.FindFolderByPath("b");

6
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -60,9 +60,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
public class UrlModule : ISharedRegionModule, IUrlModule
{
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log =
// LogManager.GetLogger(
// MethodBase.GetCurrentMethod().DeclaringType);
private Dictionary<UUID, UrlData> m_RequestMap =
new Dictionary<UUID, UrlData>();

1
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@ -39,7 +39,6 @@ using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
using OpenMetaverse;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
{
public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService

2
OpenSim/Region/Framework/ModuleLoader.cs
View File

@ -184,6 +184,8 @@ namespace OpenSim.Region.Framework
public IRegionModule[] LoadModules(string dllName)
{
//m_log.DebugFormat("[MODULES]: Looking for modules in {0}", dllName);
List<IRegionModule> modules = new List<IRegionModule>();
Assembly pluginAssembly;

3
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -2863,7 +2863,8 @@ namespace OpenSim.Region.Physics.OdePlugin
//if ((framecount % m_randomizeWater) == 0)
// randomizeWater(waterlevel);
int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
//int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
m_rayCastManager.ProcessQueuedRequests();
collision_optimized(timeStep);

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -9032,8 +9032,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Match m = r.Match(url);
if (m.Success) {
for (int i = 1; i < gnums.Length; i++) {
System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
CaptureCollection cc = g.Captures;
//System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
//CaptureCollection cc = g.Captures;
}
if (m.Groups.Count == 5) {
httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));

4
OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs
View File

@ -46,12 +46,12 @@ namespace OpenSim.Server.Handlers.Freeswitch
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IFreeswitchService m_FreeswitchService;
//private IFreeswitchService m_FreeswitchService;
public FreeswitchServerGetHandler(IFreeswitchService service) :
base("GET", "/api")
{
m_FreeswitchService = service;
//m_FreeswitchService = service;
}
public override byte[] Handle(string path, Stream request,

4
OpenSim/Services/FreeswitchService/FreeswitchService.cs
View File

@ -38,9 +38,7 @@ namespace OpenSim.Services.FreeswitchService
{
public class FreeswitchService : FreeswitchServiceBase, IFreeswitchService
{
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public FreeswitchService(IConfigSource config) : base(config)
{

BIN
bin/HttpServer.dll
View File

Binary file not shown.

44
bin/OpenMetaverse.Http.XML
View File

@ -4,28 +4,6 @@
<name>OpenMetaverse.Http</name>
</assembly>
<members>
<member name="T:OpenMetaverse.Http.Logger">
<summary>
Singleton logging class for the entire library
</summary>
</member>
<member name="F:OpenMetaverse.Http.Logger.Log">
<summary>log4net logging engine</summary>
</member>
<member name="F:OpenMetaverse.Http.log4netLogWriter.Instance">
<summary>
Singleton instance of this class
</summary>
</member>
<member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
<summary>=</summary>
</member>
<member name="F:OpenMetaverse.Http.EventQueueClient._errorCount">
<summary>Number of times we've received an unknown CAPS exception in series.</summary>
</member>
<member name="F:OpenMetaverse.Http.EventQueueClient._random">
<summary>For exponential backoff on error.</summary>
</member>
<member name="F:OpenMetaverse.Http.EventQueueServer.CONNECTION_TIMEOUT">
<summary>The number of milliseconds to wait before the connection times out
and an empty response is sent to the client. This value should be higher
@ -44,6 +22,19 @@
events and never sending a response if there is a constant stream of new
events</summary>
</member>
<member name="T:OpenMetaverse.Http.Logger">
<summary>
Singleton logging class for the entire library
</summary>
</member>
<member name="F:OpenMetaverse.Http.Logger.Log">
<summary>log4net logging engine</summary>
</member>
<member name="F:OpenMetaverse.Http.log4netLogWriter.Instance">
<summary>
Singleton instance of this class
</summary>
</member>
<member name="T:OpenMetaverse.Http.CapsRequestCallback">
<summary>
Delegate for handling incoming HTTP requests through a capability
@ -53,5 +44,14 @@
<param name="response">HTTP response</param>
<param name="state">User-defined state object</param>
</member>
<member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
<summary>=</summary>
</member>
<member name="F:OpenMetaverse.Http.EventQueueClient._errorCount">
<summary>Number of times we've received an unknown CAPS exception in series.</summary>
</member>
<member name="F:OpenMetaverse.Http.EventQueueClient._random">
<summary>For exponential backoff on error.</summary>
</member>
</members>
</doc>

BIN
bin/OpenMetaverse.Http.dll
View File

Binary file not shown.

114
bin/OpenMetaverse.StructuredData.XML
View File

@ -15,63 +15,6 @@
</summary>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Byte[])">
<summary>
</summary>
<param name="xmlData"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.String)">
<summary>
</summary>
<param name="xmlData"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Xml.XmlTextReader)">
<summary>
</summary>
<param name="xmlData"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(OpenMetaverse.StructuredData.OSD)">
<summary>
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlString(OpenMetaverse.StructuredData.OSD)">
<summary>
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlElement(System.Xml.XmlTextWriter,OpenMetaverse.StructuredData.OSD)">
<summary>
</summary>
<param name="writer"></param>
<param name="data"></param>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.TryValidateLLSDXml(System.Xml.XmlTextReader,System.String@)">
<summary>
</summary>
<param name="xmlData"></param>
<param name="error"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.ParseLLSDXmlElement(System.Xml.XmlTextReader)">
<summary>
</summary>
<param name="reader"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
<summary>
@ -151,6 +94,63 @@
<param name="intHostEnd"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Byte[])">
<summary>
</summary>
<param name="xmlData"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.String)">
<summary>
</summary>
<param name="xmlData"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Xml.XmlTextReader)">
<summary>
</summary>
<param name="xmlData"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(OpenMetaverse.StructuredData.OSD)">
<summary>
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlString(OpenMetaverse.StructuredData.OSD)">
<summary>
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlElement(System.Xml.XmlTextWriter,OpenMetaverse.StructuredData.OSD)">
<summary>
</summary>
<param name="writer"></param>
<param name="data"></param>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.TryValidateLLSDXml(System.Xml.XmlTextReader,System.String@)">
<summary>
</summary>
<param name="xmlData"></param>
<param name="error"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.ParseLLSDXmlElement(System.Xml.XmlTextReader)">
<summary>
</summary>
<param name="reader"></param>
<returns></returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDNotationElement(System.IO.StringReader)">
<summary>

BIN
bin/OpenMetaverse.StructuredData.dll
View File

Binary file not shown.

30412
bin/OpenMetaverse.XML
View File

File diff suppressed because it is too large Load Diff

BIN
bin/OpenMetaverse.dll
View File

Binary file not shown.

2
bin/OpenMetaverse.dll.config
View File

@ -1,5 +1,5 @@
<configuration>
<dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1" />
</configuration>

1384
bin/OpenMetaverseTypes.XML
View File

File diff suppressed because it is too large Load Diff

BIN
bin/OpenMetaverseTypes.dll
View File

Binary file not shown.

0
bin/Regions/.keep Normal file
View File