aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs (renamed from OpenSim/Region/Simulation/EstateManager.cs)0
-rw-r--r--OpenSim/Region/Environment/OpenSim.Region.Environment.csproj (renamed from OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj)15
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs (renamed from OpenSim/Region/Simulation/ParcelManager.cs)0
-rw-r--r--OpenSim/Region/Environment/RegionManager.cs (renamed from OpenSim/Region/Simulation/RegionManager.cs)1
-rw-r--r--OpenSim/Region/Environment/Scenes/Entity.cs (renamed from OpenSim/Region/Simulation/Scenes/Entity.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs (renamed from OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive.cs (renamed from OpenSim/Region/Simulation/Scenes/Primitive.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs (renamed from OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Scripting.cs (renamed from OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs (renamed from OpenSim/Region/Simulation/Scenes/Scene.cs)4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs (renamed from OpenSim/Region/Simulation/Scenes/SceneBase.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs (renamed from OpenSim/Region/Simulation/Scenes/SceneEvents.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs (renamed from OpenSim/Region/Simulation/Scenes/SceneObject.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs (renamed from OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs (renamed from OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs (renamed from OpenSim/Region/Simulation/Scenes/ScenePresence.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs (renamed from OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs (renamed from OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs (renamed from OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/Script.cs (renamed from OpenSim/Region/Simulation/Scenes/scripting/Script.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs (renamed from OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs)0
-rw-r--r--OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs (renamed from OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs)0
22 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index c2c1ecf..c2c1ecf 100644
--- a/OpenSim/Region/Simulation/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 3f8b60d..6f07969 100644
--- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -120,6 +120,12 @@
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 121 <Private>False</Private>
122 </ProjectReference> 122 </ProjectReference>
123 <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj">
124 <Name>OpenSim.Region.Capabilities</Name>
125 <Project>{39038E85-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private>
128 </ProjectReference>
123 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> 129 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
124 <Name>OpenSim.Region.Physics.Manager</Name> 130 <Name>OpenSim.Region.Physics.Manager</Name>
125 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> 131 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
@@ -134,16 +140,13 @@
134 </ProjectReference> 140 </ProjectReference>
135 </ItemGroup> 141 </ItemGroup>
136 <ItemGroup> 142 <ItemGroup>
137 <Compile Include="RegionManager.cs">
138 <SubType>Code</SubType>
139 </Compile>
140 <Compile Include="EstateManager.cs"> 143 <Compile Include="EstateManager.cs">
141 <SubType>Code</SubType> 144 <SubType>Code</SubType>
142 </Compile> 145 </Compile>
143 <Compile Include="ParcelManager.cs"> 146 <Compile Include="ParcelManager.cs">
144 <SubType>Code</SubType> 147 <SubType>Code</SubType>
145 </Compile> 148 </Compile>
146 <Compile Include="Caps.cs"> 149 <Compile Include="RegionManager.cs">
147 <SubType>Code</SubType> 150 <SubType>Code</SubType>
148 </Compile> 151 </Compile>
149 <Compile Include="Scenes\Entity.cs"> 152 <Compile Include="Scenes\Entity.cs">
@@ -176,10 +179,10 @@
176 <Compile Include="Scenes\IScenePresenceBody.cs"> 179 <Compile Include="Scenes\IScenePresenceBody.cs">
177 <SubType>Code</SubType> 180 <SubType>Code</SubType>
178 </Compile> 181 </Compile>
179 <Compile Include="Scenes\Scene.cs"> 182 <Compile Include="Scenes\SceneBase.cs">
180 <SubType>Code</SubType> 183 <SubType>Code</SubType>
181 </Compile> 184 </Compile>
182 <Compile Include="Scenes\SceneBase.cs"> 185 <Compile Include="Scenes\Scene.cs">
183 <SubType>Code</SubType> 186 <SubType>Code</SubType>
184 </Compile> 187 </Compile>
185 <Compile Include="Scenes\scripting\IScriptHandler.cs"> 188 <Compile Include="Scenes\scripting\IScriptHandler.cs">
diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 1cab4ab..1cab4ab 100644
--- a/OpenSim/Region/Simulation/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
index 17d9aad..4ff55a8 100644
--- a/OpenSim/Region/Simulation/RegionManager.cs
+++ b/OpenSim/Region/Environment/RegionManager.cs
@@ -5,6 +5,7 @@ using OpenSim.Framework.Communications;
5using OpenSim.Framework; 5using OpenSim.Framework;
6using OpenSim.Framework.Types; 6using OpenSim.Framework.Types;
7using OpenSim.Framework.Servers; 7using OpenSim.Framework.Servers;
8using OpenSim.Region.Capabilities;
8 9
9namespace OpenSim.Region.Environment 10namespace OpenSim.Region.Environment
10{ 11{
diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index bbba34d..bbba34d 100644
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
diff --git a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
index 36023d0..36023d0 100644
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index 0f649b2..0f649b2 100644
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 1d55c4d..1d55c4d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
index 2249c3d..2249c3d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e71f601..ff54efa 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Environment.Scenes
68 protected RegionCommsListener regionCommsHost; 68 protected RegionCommsListener regionCommsHost;
69 protected CommunicationsManager commsManager; 69 protected CommunicationsManager commsManager;
70 70
71 protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); 71 protected Dictionary<LLUUID, Capabilities.Caps> capsHandlers = new Dictionary<LLUUID, Capabilities.Caps>();
72 protected BaseHttpServer httpListener; 72 protected BaseHttpServer httpListener;
73 73
74 public ParcelManager parcelManager; 74 public ParcelManager parcelManager;
@@ -672,7 +672,7 @@ namespace OpenSim.Region.Environment.Scenes
672 if (agent.CapsPath != "") 672 if (agent.CapsPath != "")
673 { 673 {
674 //Console.WriteLine("new user, so creating caps handler for it"); 674 //Console.WriteLine("new user, so creating caps handler for it");
675 Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID); 675 Capabilities.Caps cap = new Capabilities.Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
676 cap.RegisterHandlers(); 676 cap.RegisterHandlers();
677 this.capsHandlers.Add(agent.AgentID, cap); 677 this.capsHandlers.Add(agent.AgentID, cap);
678 } 678 }
diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 3d8f522..3d8f522 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index fa1bacb..fa1bacb 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 88fb160..88fb160 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index 2caabc2..2caabc2 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
index 2c81d2a..2c81d2a 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 96e5c94..96e5c94 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
index eb8a117..eb8a117 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
index e813626..e813626 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
index 115b4f4..115b4f4 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 5d398b0..5d398b0 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
index 0ce65ea..0ce65ea 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
index 90c79e3..90c79e3 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs