15 files changed, 157 insertions, 157 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index c28025b..d3b4e49 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using Nini.Config;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
@@ -270,7 +271,7 @@ namespace OpenSim
             }
             assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
             m_assetCache = new AssetCache(assetServer);
-            // m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
+            // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
         }
 
         protected override LogBase CreateLog()
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 3b4c0f8..2489739 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -34,13 +34,12 @@ using System.Timers;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Communications.Caches;
-
 using Timer = System.Timers.Timer;
 
 namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index f02f105..7134ad3 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -30,9 +30,9 @@ using System.Net;
 using System.Net.Sockets;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Communications.Caches;
 using libsecondlife;
 
 namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index a1ec4e3..f5253ba 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
@@ -39,7 +40,6 @@ using OpenSim.Region.Environment;
 using libsecondlife;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Caches;
 
 namespace OpenSim.Region.ClientStack
 {
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 9a3d01a..c7a3524 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -31,10 +31,10 @@ using System.Net;
 using System.Net.Sockets;
 using libsecondlife.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Communications.Caches;
 
 namespace OpenSim.Region.ClientStack
 {
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 3031b8a..aa0105c 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -27,9 +27,9 @@
 */
 using System;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Data;
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index af239f7..dd85d54 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -1,8 +1,8 @@
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications.Caches;
- 
+
 
 namespace OpenSim.Region.Communications.OGS1
 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 071ad0f..dea4b9f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Communications.OGS1
             return new XmlRpcResponse();
         }
 
-        #region InterRegion Comms
+        #region m_interRegion Comms
         /// <summary>
         /// 
         /// </summary>
diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
index 3f737e1..0fd03d3 100644
--- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -6,152 +6,152 @@ using OpenSim.Framework.Utilities;
 using OpenSim.Region.Environment.Interfaces;

 using OpenSim.Region.Environment.Scenes;

 

-namespace OpenSim.Region.Environment.Modules
-{
-    public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
-    {
+namespace OpenSim.Region.Environment.Modules

+{

+    public class DynamicTextureModule : IRegionModule, IDynamicTextureManager

+    {

         private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>();

 

         private Dictionary<string, IDynamicTextureRender> RenderPlugins =

             new Dictionary<string, IDynamicTextureRender>();

 

-        private Dictionary<LLUUID, DynamicTextureUpdater> Updaters = new Dictionary<LLUUID, DynamicTextureUpdater>();
-
-        public void Initialise(Scene scene)
-        {
-            if (!RegisteredScenes.ContainsKey(scene.RegionInfo.SimUUID))
-            {
-                RegisteredScenes.Add(scene.RegionInfo.SimUUID, scene);
-                scene.RegisterModuleInterface<IDynamicTextureManager>(this);
-            }
-        }
-
-        public void PostInitialise()
+        private Dictionary<LLUUID, DynamicTextureUpdater> Updaters = new Dictionary<LLUUID, DynamicTextureUpdater>();

+

+        public void Initialise(Scene scene)

+        {

+            if (!RegisteredScenes.ContainsKey(scene.RegionInfo.SimUUID))

+            {

+                RegisteredScenes.Add(scene.RegionInfo.SimUUID, scene);

+                scene.RegisterModuleInterface<IDynamicTextureManager>(this);

+            }

+        }

+

+        public void PostInitialise()

+        {

+        }

+

+        public void CloseDown()

+        {

+        }

+

+        public string GetName()

         {

-        }
-
-        public void CloseDown()
-        {
-        }
-
-        public string GetName()
-        {
-            return "DynamicTextureModule";
-        }
-
-        public bool IsSharedModule()
-        {
-            return true;
-        }
-
-        public void RegisterRender(string handleType, IDynamicTextureRender render)
-        {
-            if (!RenderPlugins.ContainsKey(handleType))
-            {
-                RenderPlugins.Add(handleType, render);
-            }
-        }
-
-        public void ReturnData(LLUUID id, byte[] data)
-        {
-            if (Updaters.ContainsKey(id))
-            {
-                DynamicTextureUpdater updater = Updaters[id];
-                if (RegisteredScenes.ContainsKey(updater.SimUUID))
-                {
-                    Scene scene = RegisteredScenes[updater.SimUUID];
-                    updater.DataReceived(data, scene);
-                }
-            }
-        }
-
+            return "DynamicTextureModule";

+        }

+

+        public bool IsSharedModule()

+        {

+            return true;

+        }

+

+        public void RegisterRender(string handleType, IDynamicTextureRender render)

+        {

+            if (!RenderPlugins.ContainsKey(handleType))

+            {

+                RenderPlugins.Add(handleType, render);

+            }

+        }

+

+        public void ReturnData(LLUUID id, byte[] data)

+        {

+            if (Updaters.ContainsKey(id))

+            {

+                DynamicTextureUpdater updater = Updaters[id];

+                if (RegisteredScenes.ContainsKey(updater.SimUUID))

+                {

+                    Scene scene = RegisteredScenes[updater.SimUUID];

+                    updater.DataReceived(data, scene);

+                }

+            }

+        }

+

         public LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url,

-                                           string extraParams, int updateTimer)
-        {
-            Console.WriteLine("dynamic texture being created: " + url + " of type " + contentType);
-            if (RenderPlugins.ContainsKey(contentType))
-            {
-                DynamicTextureUpdater updater = new DynamicTextureUpdater();
-                updater.SimUUID = simID;
-                updater.PrimID = primID;
-                updater.ContentType = contentType;
-                updater.Url = url;
-                updater.UpdateTimer = updateTimer;
-                updater.UpdaterID = LLUUID.Random();
-                updater.Params = extraParams;
-
-                if (!Updaters.ContainsKey(updater.UpdaterID))
-                {
-                    Updaters.Add(updater.UpdaterID, updater);
-                }
-
-                RenderPlugins[contentType].AsyncConvertUrl(updater.UpdaterID, url, extraParams);
-                return updater.UpdaterID;
-            }
-            return LLUUID.Zero;
-        }
-
+                                           string extraParams, int updateTimer)

+        {

+            Console.WriteLine("dynamic texture being created: " + url + " of type " + contentType);

+            if (RenderPlugins.ContainsKey(contentType))

+            {

+                DynamicTextureUpdater updater = new DynamicTextureUpdater();

+                updater.SimUUID = simID;

+                updater.PrimID = primID;

+                updater.ContentType = contentType;

+                updater.Url = url;

+                updater.UpdateTimer = updateTimer;

+                updater.UpdaterID = LLUUID.Random();

+                updater.Params = extraParams;

+

+                if (!Updaters.ContainsKey(updater.UpdaterID))

+                {

+                    Updaters.Add(updater.UpdaterID, updater);

+                }

+

+                RenderPlugins[contentType].AsyncConvertUrl(updater.UpdaterID, url, extraParams);

+                return updater.UpdaterID;

+            }

+            return LLUUID.Zero;

+        }

+

         public LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data,

-                                            string extraParams, int updateTimer)
-        {
-            if (RenderPlugins.ContainsKey(contentType))
-            {
-                DynamicTextureUpdater updater = new DynamicTextureUpdater();
-                updater.SimUUID = simID;
-                updater.PrimID = primID;
-                updater.ContentType = contentType;
-                updater.BodyData = data;
-                updater.UpdateTimer = updateTimer;
-                updater.UpdaterID = LLUUID.Random();
-                updater.Params = extraParams;
-
-                if (!Updaters.ContainsKey(updater.UpdaterID))
-                {
-                    Updaters.Add(updater.UpdaterID, updater);
-                }
-
-                RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams);
-                return updater.UpdaterID;
-            }
-            return LLUUID.Zero;
-        }
-
-        public class DynamicTextureUpdater
-        {
-            public LLUUID SimUUID;
-            public LLUUID UpdaterID;
-            public string ContentType;
-            public string Url;
-            public string BodyData;
-            public LLUUID PrimID;
-            public int UpdateTimer;
-            public LLUUID LastAssetID;
-            public string Params;
-
-            public DynamicTextureUpdater()
-            {
-                LastAssetID = LLUUID.Zero;
-                UpdateTimer = 0;
-                BodyData = null;
-            }
-
-            public void DataReceived(byte[] data, Scene scene)
-            {
-                //TODO delete the last asset(data), if it was a dynamic texture
-
-                AssetBase asset = new AssetBase();
-                asset.FullID = LLUUID.Random();
-                asset.Data = data;
-                asset.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);
-                asset.Type = 0;
-                scene.commsManager.AssetCache.AddAsset(asset);
-
-                LastAssetID = asset.FullID;
-
-                SceneObjectPart part = scene.GetSceneObjectPart(PrimID);
-                part.Shape.TextureEntry = new LLObject.TextureEntry(asset.FullID).ToBytes();
-                part.ScheduleFullUpdate();
-            }
-        }
-    }
+                                            string extraParams, int updateTimer)

+        {

+            if (RenderPlugins.ContainsKey(contentType))

+            {

+                DynamicTextureUpdater updater = new DynamicTextureUpdater();

+                updater.SimUUID = simID;

+                updater.PrimID = primID;

+                updater.ContentType = contentType;

+                updater.BodyData = data;

+                updater.UpdateTimer = updateTimer;

+                updater.UpdaterID = LLUUID.Random();

+                updater.Params = extraParams;

+

+                if (!Updaters.ContainsKey(updater.UpdaterID))

+                {

+                    Updaters.Add(updater.UpdaterID, updater);

+                }

+

+                RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams);

+                return updater.UpdaterID;

+            }

+            return LLUUID.Zero;

+        }

+

+        public class DynamicTextureUpdater

+        {

+            public LLUUID SimUUID;

+            public LLUUID UpdaterID;

+            public string ContentType;

+            public string Url;

+            public string BodyData;

+            public LLUUID PrimID;

+            public int UpdateTimer;

+            public LLUUID LastAssetID;

+            public string Params;

+

+            public DynamicTextureUpdater()

+            {

+                LastAssetID = LLUUID.Zero;

+                UpdateTimer = 0;

+                BodyData = null;

+            }

+

+            public void DataReceived(byte[] data, Scene scene)

+            {

+                //TODO delete the last asset(data), if it was a dynamic texture

+

+                AssetBase asset = new AssetBase();

+                asset.FullID = LLUUID.Random();

+                asset.Data = data;

+                asset.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);

+                asset.Type = 0;

+                scene.commsManager.AssetCache.AddAsset(asset);

+

+                LastAssetID = asset.FullID;

+

+                SceneObjectPart part = scene.GetSceneObjectPart(PrimID);

+                part.Shape.TextureEntry = new LLObject.TextureEntry(asset.FullID).ToBytes();

+                part.ScheduleFullUpdate();

+            }

+        }

+    }

 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index cff832e..90736f4 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -35,7 +35,7 @@ using Axiom.Math;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Caches;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index fc81d5f..b3cd99c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 using libsecondlife;
-using OpenSim.Framework.Communications.Caches;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index c1c678f..890008d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public LLVector3 AbsolutePosition
+        public override LLVector3 AbsolutePosition
         {
             get { return m_rootPart.GroupPosition; }
             set
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 4d2c8e2..b8ef17b 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_controllingClient; }
         }
 
-        public LLVector3 AbsolutePosition
+        public override LLVector3 AbsolutePosition
         {
             get
             {
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }        
       
-        public LLVector3 Velocity
+        public override LLVector3 Velocity
         {
             get
             {
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index e4b033d..6d216e3 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
@@ -9,8 +10,6 @@ using OpenSim.Framework.Types;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Terrain;
 using OpenSim.Region.Environment;
-using OpenSim.Framework.Communications.Caches;
-
 using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
 
 namespace SimpleApp
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 2ff9ff0..d693cce 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using libsecondlife;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Caches;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;