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

13 files changed, 70 insertions, 59 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 0b9ea42..6a07bc9 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -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
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 4070b49..47e0293 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -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;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e532939..9142b36 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -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();
             }
         }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index fad9218..eaf8f60 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -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;
             }
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 5be2a65..19f0f90 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -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.
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index dd524f5..cd14340 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -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,17 +264,22 @@ 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());
         }
 
         /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
-        /// no account exists with the creator name 
+        /// no account exists with the creator name
         /// </summary>
         //[Test]
         public void TestLoadIarV0_1TempProfiles()
@@ -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>();
             
@@ -386,10 +396,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 = string.Format(
                     "{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");            
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 7082e85..ad42523 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -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>();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index a304357..e70d985 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -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
diff --git a/OpenSim/Region/Framework/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
index 0242afd..23be9c2 100644
--- a/OpenSim/Region/Framework/ModuleLoader.cs
+++ b/OpenSim/Region/Framework/ModuleLoader.cs
@@ -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;
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 83db396..9805ff5 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -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);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index acab734..bc36fda 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -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())));
diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs
index c2a64b8..8b41742 100644
--- a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs
@@ -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,
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 84674ec..0a38300 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -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)
         {