aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs3
-rw-r--r--OpenSim/Region/Application/OpenSim.csproj79
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs28
-rw-r--r--OpenSim/Region/Caches/AssetCache.cs2
-rw-r--r--OpenSim/Region/Caches/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Region/ClientStack/Assets/InventoryCache.cs1
-rw-r--r--OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientViewBase.cs2
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs4
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs5
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs7
-rw-r--r--OpenSim/Region/ClientStack/VersionInfo.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs16
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs9
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj71
-rw-r--r--OpenSim/Region/LocalCommunications/CommunicationsLocal.cs61
-rw-r--r--OpenSim/Region/LocalCommunications/LocalBackEndServices.cs209
-rw-r--r--OpenSim/Region/LocalCommunications/LocalUserServices.cs118
-rw-r--r--OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj121
-rw-r--r--OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user12
-rw-r--r--OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs35
-rw-r--r--OpenSim/Region/Simulation/Caps.cs6
-rw-r--r--OpenSim/Region/Simulation/EstateManager.cs8
-rw-r--r--OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj (renamed from OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj)57
-rw-r--r--OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user12
-rw-r--r--OpenSim/Region/Simulation/ParcelManager.cs8
-rw-r--r--OpenSim/Region/Simulation/RegionManager.cs6
-rw-r--r--OpenSim/Region/Simulation/Scenes/Entity.cs4
-rw-r--r--OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/Primitive.cs6
-rw-r--r--OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs6
-rw-r--r--OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/Scene.cs14
-rw-r--r--OpenSim/Region/Simulation/Scenes/SceneBase.cs6
-rw-r--r--OpenSim/Region/Simulation/Scenes/SceneEvents.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/SceneObject.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs4
-rw-r--r--OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs10
-rw-r--r--OpenSim/Region/Simulation/Scenes/scripting/Script.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs2
-rw-r--r--OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs2
-rw-r--r--OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs2
57 files changed, 220 insertions, 770 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 40701b0..1dcd99b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
32using OpenSim.Region.ClientStack;
32 33
33namespace OpenSim 34namespace OpenSim
34{ 35{
@@ -108,7 +109,7 @@ namespace OpenSim
108 sim.m_sandbox = sandBoxMode; 109 sim.m_sandbox = sandBoxMode;
109 sim.user_accounts = userAccounts; 110 sim.user_accounts = userAccounts;
110 sim.gridLocalAsset = gridLocalAsset; 111 sim.gridLocalAsset = gridLocalAsset;
111 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying; 112 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
112 113
113 sim.StartUp(); 114 sim.StartUp();
114 115
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 214f2cf..fcde555 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim</AssemblyName> 13 <AssemblyName>OpenSim</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 18 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim</RootNamespace> 21 <RootNamespace>OpenSim</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,30 +61,31 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="Axiom.MathLib.dll" > 68 <Reference Include="Axiom.MathLib.dll">
62 <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> 69 <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="Db4objects.Db4o.dll" > 72 <Reference Include="Db4objects.Db4o.dll">
66 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> 73 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="libsecondlife.dll" > 76 <Reference Include="libsecondlife.dll">
70 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 77 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="System" > 80 <Reference Include="System">
74 <HintPath>System.dll</HintPath> 81 <HintPath>System.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
77 <Reference Include="System.Xml" > 84 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 85 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 86 <Private>False</Private>
80 </Reference> 87 </Reference>
81 <Reference Include="XMLRPC.dll" > 88 <Reference Include="XMLRPC.dll">
82 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> 89 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
83 <Private>False</Private> 90 <Private>False</Private>
84 </Reference> 91 </Reference>
@@ -88,79 +95,75 @@
88 <Name>OpenSim.Framework</Name> 95 <Name>OpenSim.Framework</Name>
89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 96 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 98 <Private>False</Private>
92 </ProjectReference> 99 </ProjectReference>
93 <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> 100 <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
94 <Name>OpenSim.Framework.Communications</Name> 101 <Name>OpenSim.Framework.Communications</Name>
95 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> 102 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 103 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 104 <Private>False</Private>
98 </ProjectReference>
99 <ProjectReference Include="..\..\Framework\Communications.OGS1\OpenSim.Framework.Communications.OGS1.csproj">
100 <Name>OpenSim.Framework.Communications.OGS1</Name>
101 <Project>{6109024D-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private>
104 </ProjectReference> 105 </ProjectReference>
105 <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> 106 <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
106 <Name>OpenSim.Framework.Console</Name> 107 <Name>OpenSim.Framework.Console</Name>
107 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 108 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 109 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 110 <Private>False</Private>
110 </ProjectReference> 111 </ProjectReference>
111 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> 112 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
112 <Name>OpenSim.Framework.GenericConfig.Xml</Name> 113 <Name>OpenSim.Framework.GenericConfig.Xml</Name>
113 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> 114 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 115 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 116 <Private>False</Private>
116 </ProjectReference> 117 </ProjectReference>
117 <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> 118 <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
118 <Name>OpenSim.Framework.Servers</Name> 119 <Name>OpenSim.Framework.Servers</Name>
119 <Project>{2CC71860-0000-0000-0000-000000000000}</Project> 120 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 121 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 122 <Private>False</Private>
122 </ProjectReference> 123 </ProjectReference>
123 <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj"> 124 <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
124 <Name>OpenSim.Framework.UserManagement</Name> 125 <Name>OpenSim.Framework.UserManagement</Name>
125 <Project>{586E2916-0000-0000-0000-000000000000}</Project> 126 <Project>{586E2916-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 127 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private> 128 <Private>False</Private>
128 </ProjectReference> 129 </ProjectReference>
129 <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> 130 <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
130 <Name>OpenSim.Region.Caches</Name> 131 <Name>OpenSim.Region.Caches</Name>
131 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> 132 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
132 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 133 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
133 <Private>False</Private> 134 <Private>False</Private>
134 </ProjectReference> 135 </ProjectReference>
135 <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj"> 136 <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj">
136 <Name>OpenSim.Region.ClientStack</Name> 137 <Name>OpenSim.Region.ClientStack</Name>
137 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> 138 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
138 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 139 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
139 <Private>False</Private> 140 <Private>False</Private>
140 </ProjectReference> 141 </ProjectReference>
141 <ProjectReference Include="..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj"> 142 <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
142 <Name>OpenSim.Region.LocalCommunications</Name>
143 <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project> 143 <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
144 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 144 <Name>OpenSim.Region.Communications.Local</Name>
145 <Private>False</Private> 145 </ProjectReference>
146 <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj">
147 <Project>{6109024D-0000-0000-0000-000000000000}</Project>
148 <Name>OpenSim.Region.Communications.OGS1</Name>
146 </ProjectReference> 149 </ProjectReference>
147 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> 150 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
148 <Name>OpenSim.Region.Physics.Manager</Name> 151 <Name>OpenSim.Region.Physics.Manager</Name>
149 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> 152 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
150 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 153 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
151 <Private>False</Private> 154 <Private>False</Private>
152 </ProjectReference> 155 </ProjectReference>
153 <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj"> 156 <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj">
154 <Name>OpenSim.Region.Simulation</Name> 157 <Name>OpenSim.Region.Environment</Name>
155 <Project>{C0DAB338-0000-0000-0000-000000000000}</Project> 158 <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
156 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 159 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
157 <Private>False</Private> 160 <Private>False</Private>
158 </ProjectReference> 161 </ProjectReference>
159 <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> 162 <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
160 <Name>OpenSim.Region.Terrain.BasicTerrain</Name> 163 <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
161 <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> 164 <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
162 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 165 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
163 <Private>False</Private> 166 <Private>False</Private>
164 </ProjectReference> 167 </ProjectReference>
165 </ItemGroup> 168 </ItemGroup>
166 <ItemGroup> 169 <ItemGroup>
@@ -178,4 +181,4 @@
178 <PostBuildEvent> 181 <PostBuildEvent>
179 </PostBuildEvent> 182 </PostBuildEvent>
180 </PropertyGroup> 183 </PropertyGroup>
181</Project> 184</Project> \ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7da2263..db4185c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -38,22 +38,24 @@ using System.Collections;
38using System.Collections.Generic; 38using System.Collections.Generic;
39using libsecondlife; 39using libsecondlife;
40using libsecondlife.Packets; 40using libsecondlife.Packets;
41using OpenSim.Region; 41using OpenSim.Region.Environment;
42using OpenSim.Region.Scenes; 42using OpenSim.Region.Environment.Scenes;
43using OpenSim.Terrain; 43using OpenSim.Terrain;
44using OpenSim.Framework.Interfaces; 44using OpenSim.Framework.Interfaces;
45using OpenSim.Framework.Types; 45using OpenSim.Framework.Types;
46using OpenSim.Framework; 46using OpenSim.Framework;
47using OpenSim.Assets; 47using OpenSim.Assets;
48using OpenSim.Caches; 48using OpenSim.Region.Caches;
49using OpenSim.Framework.Console; 49using OpenSim.Framework.Console;
50using OpenSim.Physics.Manager; 50using OpenSim.Physics.Manager;
51using Nwc.XmlRpc; 51using Nwc.XmlRpc;
52using OpenSim.Servers; 52using OpenSim.Framework.Servers;
53using OpenSim.GenericConfig; 53using OpenSim.GenericConfig;
54using OpenGrid.Framework.Communications; 54using OpenSim.Framework.Communications;
55using OpenSim.LocalCommunications; 55using OpenSim.Region.Communications.OGS1;
56using OpenGrid.Framework.Communications.OGS1; 56using OpenSim.Region.Communications.Local;
57
58using OpenSim.Region.ClientStack;
57 59
58namespace OpenSim 60namespace OpenSim
59{ 61{
@@ -241,7 +243,7 @@ namespace OpenSim
241 243
242 udpServer.LocalWorld = LocalWorld; 244 udpServer.LocalWorld = LocalWorld;
243 245
244 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. 246 LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
245 LocalWorld.LoadWorldMap(); 247 LocalWorld.LoadWorldMap();
246 248
247 m_log.Verbose( "Main.cs:Startup() - Starting up messaging system"); 249 m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
@@ -358,23 +360,23 @@ namespace OpenSim
358 case "": 360 case "":
359 this.m_physicsEngine = "basicphysics"; 361 this.m_physicsEngine = "basicphysics";
360 configData.SetAttribute("PhysicsEngine", "basicphysics"); 362 configData.SetAttribute("PhysicsEngine", "basicphysics");
361 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; 363 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
362 break; 364 break;
363 365
364 case "basicphysics": 366 case "basicphysics":
365 this.m_physicsEngine = "basicphysics"; 367 this.m_physicsEngine = "basicphysics";
366 configData.SetAttribute("PhysicsEngine", "basicphysics"); 368 configData.SetAttribute("PhysicsEngine", "basicphysics");
367 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; 369 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false;
368 break; 370 break;
369 371
370 case "RealPhysX": 372 case "RealPhysX":
371 this.m_physicsEngine = "RealPhysX"; 373 this.m_physicsEngine = "RealPhysX";
372 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; 374 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
373 break; 375 break;
374 376
375 case "OpenDynamicsEngine": 377 case "OpenDynamicsEngine":
376 this.m_physicsEngine = "OpenDynamicsEngine"; 378 this.m_physicsEngine = "OpenDynamicsEngine";
377 OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; 379 OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true;
378 break; 380 break;
379 } 381 }
380 382
@@ -456,7 +458,7 @@ namespace OpenSim
456 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); 458 m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
457 break; 459 break;
458 case "users": 460 case "users":
459 OpenSim.Region.Scenes.ScenePresence TempAv; 461 OpenSim.Region.Environment.Scenes.ScenePresence TempAv;
460 m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); 462 m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
461 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) 463 /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
462 { 464 {
diff --git a/OpenSim/Region/Caches/AssetCache.cs b/OpenSim/Region/Caches/AssetCache.cs
index d0cc370..6cf921b 100644
--- a/OpenSim/Region/Caches/AssetCache.cs
+++ b/OpenSim/Region/Caches/AssetCache.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
38 38
39namespace OpenSim.Caches 39namespace OpenSim.Region.Caches
40{ 40{
41 public delegate void DownloadComplete(AssetCache.TextureSender sender); 41 public delegate void DownloadComplete(AssetCache.TextureSender sender);
42 42
diff --git a/OpenSim/Region/Caches/Properties/AssemblyInfo.cs b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
index 00f5dfe..5e6ecbb 100644
--- a/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Caches/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Caches")] 8[assembly: AssemblyTitle("OpenSim.Region.Caches")]
9[assembly: AssemblyDescription("")] 9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")] 10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")] 11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("OpenSim.Caches")] 12[assembly: AssemblyProduct("OpenSim.Region.Caches")]
13[assembly: AssemblyCopyright("Copyright © 2007")] 13[assembly: AssemblyCopyright("Copyright © 2007")]
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index 5d5021c..da74f85 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -35,6 +35,7 @@ using libsecondlife.Packets;
35using OpenSim.Framework.Inventory; 35using OpenSim.Framework.Inventory;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Interfaces; 37using OpenSim.Framework.Interfaces;
38using OpenSim.Region.ClientStack;
38 39
39namespace OpenSim.Assets 40namespace OpenSim.Assets
40{ 41{
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index 7552195..f99cf79 100644
--- a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -33,7 +33,7 @@ using System.Net.Sockets;
33using libsecondlife; 33using libsecondlife;
34 34
35 35
36namespace OpenSim 36namespace OpenSim.Region.ClientStack
37{ 37{
38 38
39 public interface ClientStackNetworkHandler 39 public interface ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 902f3c7..5e346fb 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Types;
35using libsecondlife; 35using libsecondlife;
36using libsecondlife.Packets; 36using libsecondlife.Packets;
37 37
38namespace OpenSim 38namespace OpenSim.Region.ClientStack
39{ 39{
40 partial class ClientView 40 partial class ClientView
41 { 41 {
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 914c38a..bc6cc21 100644
--- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -32,11 +32,11 @@ using OpenSim.Assets;
32using OpenSim.Framework.Types; 32using OpenSim.Framework.Types;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Utilities; 34using OpenSim.Framework.Utilities;
35using OpenSim.Caches; 35using OpenSim.Region.Caches;
36using libsecondlife; 36using libsecondlife;
37using libsecondlife.Packets; 37using libsecondlife.Packets;
38 38
39namespace OpenSim 39namespace OpenSim.Region.ClientStack
40{ 40{
41 partial class ClientView 41 partial class ClientView
42 { 42 {
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 32aed02..cbd10dc 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework.Utilities;
43using OpenSim.Assets; 43using OpenSim.Assets;
44 44
45namespace OpenSim 45namespace OpenSim.Region.ClientStack
46{ 46{
47 public partial class ClientView 47 public partial class ClientView
48 { 48 {
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 191ef21..51981b8 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Inventory;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework.Utilities;
43using OpenSim.Assets; 43using OpenSim.Assets;
44 44
45namespace OpenSim 45namespace OpenSim.Region.ClientStack
46{ 46{
47 public partial class ClientView 47 public partial class ClientView
48 { 48 {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 312da9d..9c4462d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -42,9 +42,9 @@ using OpenSim.Framework.Types;
42using OpenSim.Framework.Inventory; 42using OpenSim.Framework.Inventory;
43using OpenSim.Framework.Utilities; 43using OpenSim.Framework.Utilities;
44using OpenSim.Assets; 44using OpenSim.Assets;
45using OpenSim.Caches; 45using OpenSim.Region.Caches;
46 46
47namespace OpenSim 47namespace OpenSim.Region.ClientStack
48{ 48{
49 public delegate bool PacketMethod(ClientView simClient, Packet packet); 49 public delegate bool PacketMethod(ClientView simClient, Packet packet);
50 50
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 8b503f0..7d39405 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -39,7 +39,7 @@ using System.Timers;
39using OpenSim.Framework.Utilities; 39using OpenSim.Framework.Utilities;
40using OpenSim.Framework.Interfaces; 40using OpenSim.Framework.Interfaces;
41 41
42namespace OpenSim 42namespace OpenSim.Region.ClientStack
43{ 43{
44 public class ClientViewBase 44 public class ClientViewBase
45 { 45 {
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 229570c..ffd254e 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -34,9 +34,9 @@ using OpenSim.Framework;
34using System.Net; 34using System.Net;
35using System.Net.Sockets; 35using System.Net.Sockets;
36using OpenSim.Assets; 36using OpenSim.Assets;
37using OpenSim.Caches; 37using OpenSim.Region.Caches;
38 38
39namespace OpenSim 39namespace OpenSim.Region.ClientStack
40{ 40{
41 public class PacketServer 41 public class PacketServer
42 { 42 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index b421fbd..d39adb5 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -42,14 +42,13 @@ using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Assets; 44using OpenSim.Assets;
45using OpenSim.Caches; 45using OpenSim.Region.Caches;
46using OpenSim.Framework.Console; 46using OpenSim.Framework.Console;
47using OpenSim.Physics.Manager; 47using OpenSim.Physics.Manager;
48using Nwc.XmlRpc; 48using Nwc.XmlRpc;
49using OpenSim.Framework.Servers; 49using OpenSim.Framework.Servers;
50using OpenSim.Framework.GenericConfig;
51 50
52namespace OpenSim 51namespace OpenSim.Region.ClientStack
53{ 52{
54 public class RegionApplicationBase 53 public class RegionApplicationBase
55 { 54 {
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f2a02d9..33097ed 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -41,14 +41,13 @@ using OpenSim.Terrain;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.Assets; 43using OpenSim.Assets;
44using OpenSim.Caches; 44using OpenSim.Region.Caches;
45using OpenSim.Framework.Console; 45using OpenSim.Framework.Console;
46using OpenSim.Framework; 46using OpenSim.Framework;
47using Nwc.XmlRpc; 47using Nwc.XmlRpc;
48using OpenSim.Servers; 48using OpenSim.Framework.Servers;
49using OpenSim.GenericConfig;
50 49
51namespace OpenSim 50namespace OpenSim.Region.ClientStack
52{ 51{
53 52
54 public class UDPServer : ClientStackNetworkHandler 53 public class UDPServer : ClientStackNetworkHandler
diff --git a/OpenSim/Region/ClientStack/VersionInfo.cs b/OpenSim/Region/ClientStack/VersionInfo.cs
index 5d1354e..249ca94 100644
--- a/OpenSim/Region/ClientStack/VersionInfo.cs
+++ b/OpenSim/Region/ClientStack/VersionInfo.cs
@@ -27,7 +27,7 @@
27*/ 27*/
28using System; 28using System;
29 29
30namespace OpenSim 30namespace OpenSim.Region.ClientStack
31{ 31{
32 /// <summary> 32 /// <summary>
33 /// </summary> 33 /// </summary>
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 01e0c59..89f39d3 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Types; 5using OpenSim.Framework.Types;
6using OpenSim.Framework.Console; 6using OpenSim.Framework.Console;
7using libsecondlife; 7using libsecondlife;
8using OpenSim.Region; 8using OpenSim.Region.Environment;
9using Avatar=OpenSim.Region.Scenes.ScenePresence; 9using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
10using OpenSim.Region.Scenes; 10using OpenSim.Region.Environment.Scenes;
11using OpenSim.Framework; 11using OpenSim.Framework;
12using OpenSim.Caches; 12using OpenSim.Region.Caches;
13using OpenGrid.Framework.Communications; 13using OpenSim.Framework.Communications;
14using OpenSim.Servers; 14using OpenSim.Framework.Servers;
15 15
16namespace SimpleApp 16namespace SimpleApp
17{ 17{
18 public class MyWorld : Scene 18 public class MyWorld : Scene
19 { 19 {
20 private RegionInfo m_regionInfo; 20 private RegionInfo m_regionInfo;
21 private List<OpenSim.Region.Scenes.ScenePresence> m_avatars; 21 private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars;
22 22
23 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) 23 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
24 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer) 24 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
@@ -76,7 +76,7 @@ namespace SimpleApp
76 76
77 client.SendRegionHandshake(m_regionInfo); 77 client.SendRegionHandshake(m_regionInfo);
78 78
79 OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo ); 79 OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
80 80
81 } 81 }
82 82
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index e1465d1..8c1e965 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -6,13 +6,14 @@ using OpenSim.GridInterfaces.Local;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
8using OpenSim.Framework.Console; 8using OpenSim.Framework.Console;
9using OpenSim.Framework.Servers;
9using OpenSim.Assets; 10using OpenSim.Assets;
10using libsecondlife; 11using libsecondlife;
11using OpenSim.Servers;
12using OpenSim.Framework; 12using OpenSim.Framework;
13using OpenSim.Caches; 13using OpenSim.Region.Caches;
14using OpenGrid.Framework.Communications; 14using OpenSim.Framework.Communications;
15using OpenSim.LocalCommunications; 15using OpenSim.Region.Communications.Local;
16using OpenSim.Region.ClientStack;
16 17
17namespace SimpleApp 18namespace SimpleApp
18{ 19{
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 5129be2..8a62af4 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>SimpleApp</AssemblyName> 13 <AssemblyName>SimpleApp</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 18 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>SimpleApp</RootNamespace> 21 <RootNamespace>SimpleApp</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,30 +61,27 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="OpenSim.Servers" > 72 <Reference Include="System">
66 <HintPath>OpenSim.Servers.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="System" >
70 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
71 <Private>False</Private> 74 <Private>False</Private>
72 </Reference> 75 </Reference>
73 <Reference Include="System.Data.dll" > 76 <Reference Include="System.Data.dll">
74 <HintPath>..\..\..\..\bin\System.Data.dll</HintPath> 77 <HintPath>..\..\..\..\bin\System.Data.dll</HintPath>
75 <Private>False</Private> 78 <Private>False</Private>
76 </Reference> 79 </Reference>
77 <Reference Include="System.Xml" > 80 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 81 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 82 <Private>False</Private>
80 </Reference> 83 </Reference>
81 <Reference Include="XMLRPC.dll" > 84 <Reference Include="XMLRPC.dll">
82 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath> 85 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
83 <Private>False</Private> 86 <Private>False</Private>
84 </Reference> 87 </Reference>
@@ -88,49 +91,51 @@
88 <Name>OpenSim.Framework</Name> 91 <Name>OpenSim.Framework</Name>
89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 92 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 93 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 94 <Private>False</Private>
92 </ProjectReference> 95 </ProjectReference>
93 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> 96 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
94 <Name>OpenSim.Framework.Communications</Name> 97 <Name>OpenSim.Framework.Communications</Name>
95 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> 98 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 100 <Private>False</Private>
98 </ProjectReference> 101 </ProjectReference>
99 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> 102 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
100 <Name>OpenSim.Framework.Console</Name> 103 <Name>OpenSim.Framework.Console</Name>
101 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 106 <Private>False</Private>
107 </ProjectReference>
108 <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
109 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
110 <Name>OpenSim.Framework.Servers</Name>
104 </ProjectReference> 111 </ProjectReference>
105 <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj"> 112 <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
106 <Name>OpenSim.Region.Caches</Name> 113 <Name>OpenSim.Region.Caches</Name>
107 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> 114 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 115 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 116 <Private>False</Private>
110 </ProjectReference> 117 </ProjectReference>
111 <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj"> 118 <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
112 <Name>OpenSim.Region.ClientStack</Name> 119 <Name>OpenSim.Region.ClientStack</Name>
113 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> 120 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 121 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 122 <Private>False</Private>
123 </ProjectReference>
124 <ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
125 <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
126 <Name>OpenSim.Region.Communications.Local</Name>
116 </ProjectReference> 127 </ProjectReference>
117 <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj"> 128 <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
118 <Name>OpenSim.Region.GridInterfaces.Local</Name> 129 <Name>OpenSim.Region.GridInterfaces.Local</Name>
119 <Project>{241A8CDD-0000-0000-0000-000000000000}</Project> 130 <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 131 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 132 <Private>False</Private>
122 </ProjectReference>
123 <ProjectReference Include="..\..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj">
124 <Name>OpenSim.Region.LocalCommunications</Name>
125 <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private>
128 </ProjectReference> 133 </ProjectReference>
129 <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj"> 134 <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
130 <Name>OpenSim.Region.Simulation</Name> 135 <Name>OpenSim.Region.Environment</Name>
131 <Project>{C0DAB338-0000-0000-0000-000000000000}</Project> 136 <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
132 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 137 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
133 <Private>False</Private> 138 <Private>False</Private>
134 </ProjectReference> 139 </ProjectReference>
135 </ItemGroup> 140 </ItemGroup>
136 <ItemGroup> 141 <ItemGroup>
@@ -151,4 +156,4 @@
151 <PostBuildEvent> 156 <PostBuildEvent>
152 </PostBuildEvent> 157 </PostBuildEvent>
153 </PropertyGroup> 158 </PropertyGroup>
154</Project> 159</Project> \ No newline at end of file
diff --git a/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs b/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
deleted file mode 100644
index 743b9b4..0000000
--- a/OpenSim/Region/LocalCommunications/CommunicationsLocal.cs
+++ /dev/null
@@ -1,61 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using libsecondlife;
33using OpenSim.Framework;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types;
36using OpenGrid.Framework.Communications;
37
38
39namespace OpenSim.LocalCommunications
40{
41 public class CommunicationsLocal : CommunicationsManager
42 {
43 public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
44 public LocalUserServices UserServices;
45
46 public CommunicationsLocal(NetworkServersInfo serversInfo)
47 : base(serversInfo)
48 {
49 UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
50 UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");
51 UserServer = UserServices;
52 GridServer = SandBoxServices;
53 InterRegion = SandBoxServices;
54 }
55
56 internal void InformRegionOfLogin(ulong regionHandle, Login login)
57 {
58 this.SandBoxServices.AddNewSession(regionHandle, login);
59 }
60 }
61}
diff --git a/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs b/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
deleted file mode 100644
index ce48c6e..0000000
--- a/OpenSim/Region/LocalCommunications/LocalBackEndServices.cs
+++ /dev/null
@@ -1,209 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenGrid.Framework.Communications;
32using libsecondlife;
33using OpenSim.Framework.Types;
34using OpenSim.Framework;
35
36namespace OpenSim.LocalCommunications
37{
38
39 public class LocalBackEndServices : IGridServices, IInterRegionCommunications
40 {
41 protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
42 protected Dictionary<ulong, RegionCommsListener> regionHosts = new Dictionary<ulong, RegionCommsListener>();
43
44 public LocalBackEndServices()
45 {
46
47 }
48
49 /// <summary>
50 /// Register a region method with the BackEnd Services.
51 /// </summary>
52 /// <param name="regionInfo"></param>
53 /// <returns></returns>
54 public RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo)
55 {
56 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
57 if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
58 {
59 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
60 this.regions.Add(regionInfo.RegionHandle, regionInfo);
61 RegionCommsListener regionHost = new RegionCommsListener();
62 this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
63
64 return regionHost;
65 }
66
67 //already in our list of regions so for now lets return null
68 return null;
69 }
70
71 /// <summary>
72 /// </summary>
73 /// <param name="regionInfo"></param>
74 /// <returns></returns>
75 public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
76 {
77 // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
78 List<RegionInfo> neighbours = new List<RegionInfo>();
79
80 foreach (RegionInfo reg in this.regions.Values)
81 {
82 // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
83 if (reg.RegionHandle != regionInfo.RegionHandle)
84 {
85 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
86 if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))
87 {
88 if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))
89 {
90 neighbours.Add(reg);
91 }
92 }
93 }
94 }
95 return neighbours;
96 }
97
98 /// <summary>
99 ///
100 /// </summary>
101 /// <param name="regionHandle"></param>
102 /// <returns></returns>
103 public RegionInfo RequestNeighbourInfo(ulong regionHandle)
104 {
105 if (this.regions.ContainsKey(regionHandle))
106 {
107 return this.regions[regionHandle];
108 }
109 return null;
110 }
111
112 /// <summary>
113 ///
114 /// </summary>
115 /// <param name="minX"></param>
116 /// <param name="minY"></param>
117 /// <param name="maxX"></param>
118 /// <param name="maxY"></param>
119 /// <returns></returns>
120 public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
121 {
122 List<MapBlockData> mapBlocks = new List<MapBlockData>();
123 foreach(RegionInfo regInfo in this.regions.Values)
124 {
125 if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
126 {
127 MapBlockData map = new MapBlockData();
128 map.Name = regInfo.RegionName;
129 map.X = (ushort)regInfo.RegionLocX;
130 map.Y = (ushort)regInfo.RegionLocY;
131 map.WaterHeight =(byte) regInfo.estateSettings.waterHeight;
132 map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
133 map.Agents = 1;
134 map.RegionFlags = 72458694;
135 map.Access = 13;
136 mapBlocks.Add(map);
137 }
138 }
139 return mapBlocks;
140 }
141
142 /// <summary>
143 /// </summary>
144 /// <param name="regionHandle"></param>
145 /// <param name="agentData"></param>
146 /// <returns></returns>
147 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
148 {
149 //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
150 if (this.regionHosts.ContainsKey(regionHandle))
151 {
152 // Console.WriteLine("CommsManager- Informing a region to expect child agent");
153 this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
154 return true;
155 }
156 return false;
157 }
158
159 /// <summary>
160 ///
161 /// </summary>
162 /// <param name="regionHandle"></param>
163 /// <param name="agentID"></param>
164 /// <param name="position"></param>
165 /// <returns></returns>
166 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
167 {
168 if (this.regionHosts.ContainsKey(regionHandle))
169 {
170 // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
171 this.regionHosts[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
172 return true;
173 }
174 return false;
175 }
176
177 /// <summary>
178 /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
179 /// </summary>
180 /// <param name="regionHandle"></param>
181 /// <param name="loginData"></param>
182 /// <returns></returns>
183 public bool AddNewSession(ulong regionHandle, Login loginData)
184 {
185 //Console.WriteLine(" comms manager been told to expect new user");
186 AgentCircuitData agent = new AgentCircuitData();
187 agent.AgentID = loginData.Agent;
188 agent.firstname = loginData.First;
189 agent.lastname = loginData.Last;
190 agent.SessionID = loginData.Session;
191 agent.SecureSessionID = loginData.SecureSession;
192 agent.circuitcode = loginData.CircuitCode;
193 agent.BaseFolder = loginData.BaseFolder;
194 agent.InventoryFolder = loginData.InventoryFolder;
195 agent.startpos = new LLVector3(128, 128, 70);
196 agent.CapsPath = loginData.CapsPath;
197
198 if (this.regionHosts.ContainsKey(regionHandle))
199 {
200 this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);
201 return true;
202 }
203
204 // region not found
205 return false;
206 }
207 }
208}
209
diff --git a/OpenSim/Region/LocalCommunications/LocalUserServices.cs b/OpenSim/Region/LocalCommunications/LocalUserServices.cs
deleted file mode 100644
index a7f7aa4..0000000
--- a/OpenSim/Region/LocalCommunications/LocalUserServices.cs
+++ /dev/null
@@ -1,118 +0,0 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using System.Text;
5
6using OpenGrid.Framework.Communications;
7//using OpenSim.Framework.User;
8using OpenGrid.Framework.UserManagement;
9using OpenGrid.Framework.Data;
10using OpenSim.Framework.Types;
11using OpenSim.Framework.Utilities;
12
13using libsecondlife;
14
15namespace OpenSim.LocalCommunications
16{
17 public class LocalUserServices : UserManagerBase, IUserServices
18 {
19 private CommunicationsLocal m_Parent;
20
21 private uint defaultHomeX ;
22 private uint defaultHomeY;
23 public LocalUserServices(CommunicationsLocal parent, uint defHomeX, uint defHomeY)
24 {
25 m_Parent = parent;
26 defaultHomeX = defHomeX;
27 defaultHomeY = defHomeY;
28 }
29
30 public UserProfileData GetUserProfile(string firstName, string lastName)
31 {
32 return GetUserProfile(firstName + " " + lastName);
33 }
34
35 public UserProfileData GetUserProfile(string name)
36 {
37 return this.getUserProfile(name);
38 }
39 public UserProfileData GetUserProfile(LLUUID avatarID)
40 {
41 return this.getUserProfile(avatarID);
42 }
43
44 /// <summary>
45 ///
46 /// </summary>
47 /// <returns></returns>
48 public override string GetMessage()
49 {
50 return "Welcome to OpenSim";
51 }
52
53 public override UserProfileData GetTheUser(string firstname, string lastname)
54 {
55 UserProfileData profile = getUserProfile(firstname, lastname);
56 if (profile != null)
57 {
58
59 return profile;
60 }
61
62 //no current user account so make one
63 Console.WriteLine("No User account found so creating a new one ");
64 this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
65
66 profile = getUserProfile(firstname, lastname);
67
68 return profile;
69 }
70
71 public override bool AuthenticateUser(ref UserProfileData profile, string password)
72 {
73 //for now we will accept any password in sandbox mode
74 Console.WriteLine("authorising user");
75 return true;
76 }
77
78 public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)
79 {
80 ulong currentRegion = theUser.currentAgent.currentHandle;
81 RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
82
83
84 if (reg != null)
85 {
86 response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
87 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
88 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
89 string capsPath = Util.GetRandomCapsPath();
90 response.SimAddress = reg.CommsIPListenAddr;
91 response.SimPort = (Int32)reg.CommsIPListenPort;
92 response.RegionX = reg.RegionLocX ;
93 response.RegionY = reg.RegionLocY ;
94 response.SeedCapability = "http://" + reg.CommsIPListenAddr + ":" + "9000" + "/CAPS/" + capsPath + "0000/";
95 theUser.currentAgent.currentRegion = reg.SimUUID;
96 theUser.currentAgent.currentHandle = reg.RegionHandle;
97
98 Login _login = new Login();
99 //copy data to login object
100 _login.First = response.Firstname;
101 _login.Last = response.Lastname;
102 _login.Agent = response.AgentID;
103 _login.Session = response.SessionID;
104 _login.SecureSession = response.SecureSessionID;
105 _login.CircuitCode = (uint)response.CircuitCode;
106 _login.CapsPath = capsPath;
107
108 m_Parent.InformRegionOfLogin(currentRegion, _login);
109 }
110 else
111 {
112 Console.WriteLine("not found region " + currentRegion);
113 }
114
115 }
116
117 }
118}
diff --git a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
deleted file mode 100644
index 6b2b78c..0000000
--- a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj
+++ /dev/null
@@ -1,121 +0,0 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{EB3A1BA8-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Region.LocalCommunications</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenSim.Region.LocalCommunications</RootNamespace>
20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
59 </PropertyGroup>
60 <ItemGroup>
61 <Reference Include="libsecondlife.dll" >
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="System" >
66 <HintPath>System.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="System.Xml" >
70 <HintPath>System.Xml.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 </ItemGroup>
74 <ItemGroup>
75 <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
76 <Name>OpenSim.Framework</Name>
77 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private>
80 </ProjectReference>
81 <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
82 <Name>OpenSim.Framework.Communications</Name>
83 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
85 <Private>False</Private>
86 </ProjectReference>
87 <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
88 <Name>OpenSim.Framework.Data</Name>
89 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private>
92 </ProjectReference>
93 <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
94 <Name>OpenSim.Framework.UserManagement</Name>
95 <Project>{586E2916-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private>
98 </ProjectReference>
99 </ItemGroup>
100 <ItemGroup>
101 <Compile Include="CommunicationsLocal.cs">
102 <SubType>Code</SubType>
103 </Compile>
104 <Compile Include="LocalBackEndServices.cs">
105 <SubType>Code</SubType>
106 </Compile>
107 <Compile Include="LocalUserServices.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 <Compile Include="Properties\AssemblyInfo.cs">
111 <SubType>Code</SubType>
112 </Compile>
113 </ItemGroup>
114 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
115 <PropertyGroup>
116 <PreBuildEvent>
117 </PreBuildEvent>
118 <PostBuildEvent>
119 </PostBuildEvent>
120 </PropertyGroup>
121</Project>
diff --git a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user b/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/LocalCommunications/OpenSim.Region.LocalCommunications.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs b/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8e6e711..0000000
--- a/OpenSim/Region/LocalCommunications/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.LocalCommunications")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("OpenSim.LocalCommunications")]
13[assembly: AssemblyCopyright("Copyright © 2007")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32// You can specify all the values or you can default the Revision and Build Numbers
33// by using the '*' as shown below:
34[assembly: AssemblyVersion("1.0.0.0")]
35[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/Simulation/Caps.cs b/OpenSim/Region/Simulation/Caps.cs
index 13a351d..9edbd54 100644
--- a/OpenSim/Region/Simulation/Caps.cs
+++ b/OpenSim/Region/Simulation/Caps.cs
@@ -4,14 +4,14 @@ using System.Collections.Generic;
4using System.Text; 4using System.Text;
5using System.IO; 5using System.IO;
6using System.Xml; 6using System.Xml;
7using OpenSim.Servers; 7using OpenSim.Framework.Servers;
8using OpenSim.Framework; 8using OpenSim.Framework;
9using OpenSim.Framework.Utilities; 9using OpenSim.Framework.Utilities;
10using OpenSim.Framework.Types; 10using OpenSim.Framework.Types;
11using OpenSim.Caches; 11using OpenSim.Region.Caches;
12using libsecondlife; 12using libsecondlife;
13 13
14namespace OpenSim.Region 14namespace OpenSim.Region.Environment
15{ 15{
16 public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data); 16 public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
17 17
diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Simulation/EstateManager.cs
index dcb5564..c2c1ecf 100644
--- a/OpenSim/Region/Simulation/EstateManager.cs
+++ b/OpenSim/Region/Simulation/EstateManager.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.Framework.Types; 31using OpenSim.Framework.Types;
32using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
33using OpenSim.Region; 33using OpenSim.Region.Environment;
34using OpenSim.Region.Scenes; 34using OpenSim.Region.Environment.Scenes;
35using OpenSim; 35using OpenSim;
36using libsecondlife; 36using libsecondlife;
37using libsecondlife.Packets; 37using libsecondlife.Packets;
38using Avatar = OpenSim.Region.Scenes.ScenePresence; 38using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
39 39
40 40
41namespace OpenSim.Region 41namespace OpenSim.Region.Environment
42{ 42{
43 43
44 /// <summary> 44 /// <summary>
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
index 7811a55..0597857 100644
--- a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj
+++ b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,18 +6,21 @@
6 <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Region.Simulation</AssemblyName> 13 <AssemblyName>OpenSim.Region.Environment</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript> 14 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> 15 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
19 <RootNamespace>OpenSim.Region.Simulation</RootNamespace> 20 </AppDesignerFolder>
20 <StartupObject></StartupObject> 21 <RootNamespace>OpenSim.Region.Environment</RootNamespace>
22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,30 +61,31 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="Axiom.MathLib.dll" > 68 <Reference Include="Axiom.MathLib.dll">
62 <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> 69 <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="Db4objects.Db4o.dll" > 72 <Reference Include="Db4objects.Db4o.dll">
66 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> 73 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="libsecondlife.dll" > 76 <Reference Include="libsecondlife.dll">
70 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 77 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="System" > 80 <Reference Include="System">
74 <HintPath>System.dll</HintPath> 81 <HintPath>System.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
77 <Reference Include="System.Xml" > 84 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 85 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 86 <Private>False</Private>
80 </Reference> 87 </Reference>
81 <Reference Include="XMLRPC.dll" > 88 <Reference Include="XMLRPC.dll">
82 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> 89 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
83 <Private>False</Private> 90 <Private>False</Private>
84 </Reference> 91 </Reference>
@@ -88,49 +95,49 @@
88 <Name>OpenSim.Framework</Name> 95 <Name>OpenSim.Framework</Name>
89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 96 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 98 <Private>False</Private>
92 </ProjectReference> 99 </ProjectReference>
93 <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> 100 <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
94 <Name>OpenSim.Framework.Communications</Name> 101 <Name>OpenSim.Framework.Communications</Name>
95 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> 102 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 103 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 104 <Private>False</Private>
98 </ProjectReference> 105 </ProjectReference>
99 <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> 106 <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
100 <Name>OpenSim.Framework.Console</Name> 107 <Name>OpenSim.Framework.Console</Name>
101 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 108 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 109 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 110 <Private>False</Private>
104 </ProjectReference> 111 </ProjectReference>
105 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> 112 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
106 <Name>OpenSim.Framework.GenericConfig.Xml</Name> 113 <Name>OpenSim.Framework.GenericConfig.Xml</Name>
107 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> 114 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 115 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 116 <Private>False</Private>
110 </ProjectReference> 117 </ProjectReference>
111 <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> 118 <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
112 <Name>OpenSim.Framework.Servers</Name> 119 <Name>OpenSim.Framework.Servers</Name>
113 <Project>{2CC71860-0000-0000-0000-000000000000}</Project> 120 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 121 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 122 <Private>False</Private>
116 </ProjectReference> 123 </ProjectReference>
117 <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> 124 <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
118 <Name>OpenSim.Region.Caches</Name> 125 <Name>OpenSim.Region.Caches</Name>
119 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> 126 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 127 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 128 <Private>False</Private>
122 </ProjectReference> 129 </ProjectReference>
123 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> 130 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
124 <Name>OpenSim.Region.Physics.Manager</Name> 131 <Name>OpenSim.Region.Physics.Manager</Name>
125 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> 132 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 133 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private> 134 <Private>False</Private>
128 </ProjectReference> 135 </ProjectReference>
129 <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> 136 <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
130 <Name>OpenSim.Region.Terrain.BasicTerrain</Name> 137 <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
131 <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> 138 <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
132 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 139 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
133 <Private>False</Private> 140 <Private>False</Private>
134 </ProjectReference> 141 </ProjectReference>
135 </ItemGroup> 142 </ItemGroup>
136 <ItemGroup> 143 <ItemGroup>
@@ -208,4 +215,4 @@
208 <PostBuildEvent> 215 <PostBuildEvent>
209 </PostBuildEvent> 216 </PostBuildEvent>
210 </PropertyGroup> 217 </PropertyGroup>
211</Project> 218</Project> \ No newline at end of file
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user b/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Region/Simulation/OpenSim.Region.Simulation.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Simulation/ParcelManager.cs
index d15d77d..1cab4ab 100644
--- a/OpenSim/Region/Simulation/ParcelManager.cs
+++ b/OpenSim/Region/Simulation/ParcelManager.cs
@@ -32,10 +32,10 @@ using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35using OpenSim.Region.Scenes; 35using OpenSim.Region.Environment.Scenes;
36using Avatar = OpenSim.Region.Scenes.ScenePresence; 36using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
37 37
38namespace OpenSim.Region 38namespace OpenSim.Region.Environment
39{ 39{
40 40
41 41
@@ -420,7 +420,7 @@ namespace OpenSim.Region
420 { 420 {
421 for (y = 0; y < inc_y; y++) 421 for (y = 0; y < inc_y; y++)
422 { 422 {
423 OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y); 423 OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y);
424 if (!temp.Contains(currentParcel)) 424 if (!temp.Contains(currentParcel))
425 { 425 {
426 currentParcel.forceUpdateParcelInfo(); 426 currentParcel.forceUpdateParcelInfo();
diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Simulation/RegionManager.cs
index a317f0f..17d9aad 100644
--- a/OpenSim/Region/Simulation/RegionManager.cs
+++ b/OpenSim/Region/Simulation/RegionManager.cs
@@ -1,12 +1,12 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenGrid.Framework.Communications; 4using OpenSim.Framework.Communications;
5using OpenSim.Framework; 5using OpenSim.Framework;
6using OpenSim.Framework.Types; 6using OpenSim.Framework.Types;
7using OpenSim.Servers; 7using OpenSim.Framework.Servers;
8 8
9namespace OpenSim.Region 9namespace OpenSim.Region.Environment
10{ 10{
11 public class RegionManager //needs renaming , but first we need to rename the namespace 11 public class RegionManager //needs renaming , but first we need to rename the namespace
12 { 12 {
diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Simulation/Scenes/Entity.cs
index f8754f5..bbba34d 100644
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ b/OpenSim/Region/Simulation/Scenes/Entity.cs
@@ -31,9 +31,9 @@ using System.Text;
31using Axiom.MathLib; 31using Axiom.MathLib;
32using OpenSim.Physics.Manager; 32using OpenSim.Physics.Manager;
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Region.Scripting; 34using OpenSim.Region.Environment.Scripting;
35 35
36namespace OpenSim.Region.Scenes 36namespace OpenSim.Region.Environment.Scenes
37{ 37{
38 public abstract class Entity : IScriptReadonlyEntity 38 public abstract class Entity : IScriptReadonlyEntity
39 { 39 {
diff --git a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
index 65077e6..36023d0 100644
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
@@ -7,7 +7,7 @@ using OpenSim.Physics.Manager;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types; 8using OpenSim.Framework.Types;
9 9
10namespace OpenSim.Region.Scenes 10namespace OpenSim.Region.Environment.Scenes
11{ 11{
12 public interface IScenePresenceBody 12 public interface IScenePresenceBody
13 { 13 {
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Simulation/Scenes/Primitive.cs
index e04c711..0f649b2 100644
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ b/OpenSim/Region/Simulation/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Inventory; 37using OpenSim.Framework.Inventory;
38 38
39namespace OpenSim.Region.Scenes 39namespace OpenSim.Region.Environment.Scenes
40{ 40{
41 public class Primitive : Entity 41 public class Primitive : Entity
42 { 42 {
@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
174 dataArrays.Add(primData.ToBytes()); 174 dataArrays.Add(primData.ToBytes());
175 foreach (Entity child in children) 175 foreach (Entity child in children)
176 { 176 {
177 if (child is OpenSim.Region.Scenes.Primitive) 177 if (child is OpenSim.Region.Environment.Scenes.Primitive)
178 { 178 {
179 dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray()); 179 dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
180 } 180 }
181 } 181 }
182 byte[] primstart = Helpers.StringToField("<Prim>"); 182 byte[] primstart = Helpers.StringToField("<Prim>");
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
index d1a2717..1d55c4d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
36using OpenSim.Framework.Inventory; 36using OpenSim.Framework.Inventory;
37using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
38 38
39namespace OpenSim.Region.Scenes 39namespace OpenSim.Region.Environment.Scenes
40{ 40{
41 public partial class Scene 41 public partial class Scene
42 { 42 {
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Scenes
218 { 218 {
219 if (ent.LocalId == primLocalID) 219 if (ent.LocalId == primLocalID)
220 { 220 {
221 ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient); 221 ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
222 break; 222 break;
223 } 223 }
224 } 224 }
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Scenes
266 { 266 {
267 if (ent.LocalId == localID) 267 if (ent.LocalId == localID)
268 { 268 {
269 ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos); 269 ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);
270 break; 270 break;
271 } 271 }
272 } 272 }
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
index 7b53388..2249c3d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using libsecondlife; 36using libsecondlife;
37 37
38namespace OpenSim.Region.Scenes 38namespace OpenSim.Region.Environment.Scenes
39{ 39{
40 public partial class Scene 40 public partial class Scene
41 { 41 {
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Simulation/Scenes/Scene.cs
index bf2244e..7e56296 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.cs
@@ -39,14 +39,14 @@ using OpenSim.Framework.Interfaces;
39using OpenSim.Framework.Types; 39using OpenSim.Framework.Types;
40using OpenSim.Framework.Inventory; 40using OpenSim.Framework.Inventory;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Region.Scripting; 42using OpenSim.Region.Environment.Scripting;
43using OpenSim.Terrain; 43using OpenSim.Terrain;
44using OpenGrid.Framework.Communications; 44using OpenSim.Framework.Communications;
45using OpenSim.Caches; 45using OpenSim.Region.Caches;
46using OpenSim.Region; 46using OpenSim.Region.Environment;
47using OpenSim.Servers; 47using OpenSim.Framework.Servers;
48 48
49namespace OpenSim.Region.Scenes 49namespace OpenSim.Region.Environment.Scenes
50{ 50{
51 public delegate bool FilterAvatarList(ScenePresence avatar); 51 public delegate bool FilterAvatarList(ScenePresence avatar);
52 52
@@ -256,7 +256,7 @@ namespace OpenSim.Region.Scenes
256 //Parcel backup routines 256 //Parcel backup routines
257 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; 257 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
258 int i = 0; 258 int i = 0;
259 foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values) 259 foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values)
260 { 260 {
261 parcels[i] = parcel.parcelData; 261 parcels[i] = parcel.parcelData;
262 i++; 262 i++;
diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
index 4dbd374..ecd14de 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
@@ -37,11 +37,11 @@ using OpenSim.Physics.Manager;
37using OpenSim.Framework.Interfaces; 37using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Types; 38using OpenSim.Framework.Types;
39using OpenSim.Framework.Inventory; 39using OpenSim.Framework.Inventory;
40using OpenSim.Region.Scripting; 40using OpenSim.Region.Environment.Scripting;
41using OpenSim.Terrain; 41using OpenSim.Terrain;
42using OpenSim.Caches; 42using OpenSim.Region.Caches;
43 43
44namespace OpenSim.Region.Scenes 44namespace OpenSim.Region.Environment.Scenes
45{ 45{
46 public abstract class SceneBase : IWorld 46 public abstract class SceneBase : IWorld
47 { 47 {
diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
index 2898578..fa1bacb 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Region.Scenes 5namespace OpenSim.Region.Environment.Scenes
6{ 6{
7 /// <summary> 7 /// <summary>
8 /// A class for triggering remote scene events. 8 /// A class for triggering remote scene events.
diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
index 5df87bf..88fb160 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
@@ -35,7 +35,7 @@ using OpenSim.Physics.Manager;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Inventory; 36using OpenSim.Framework.Inventory;
37 37
38namespace OpenSim.Region.Scenes 38namespace OpenSim.Region.Environment.Scenes
39{ 39{
40 public class SceneObject : Entity 40 public class SceneObject : Entity
41 { 41 {
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
index f0a8721..2caabc2 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
@@ -31,7 +31,7 @@ using System.Text;
31using libsecondlife; 31using libsecondlife;
32using System.Xml; 32using System.Xml;
33 33
34namespace OpenSim.Region.Scenes 34namespace OpenSim.Region.Environment.Scenes
35{ 35{
36 partial class ScenePresence 36 partial class ScenePresence
37 { 37 {
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes
66 66
67 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 67 // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
68 68
69 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID) 69 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
70 { 70 {
71 AnimsNames.Add(kp.Value, kp.Key); 71 AnimsNames.Add(kp.Value, kp.Key);
72 } 72 }
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
index d21b11f..2c81d2a 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
@@ -34,7 +34,7 @@ using OpenSim.Physics.Manager;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36 36
37namespace OpenSim.Region.Scenes 37namespace OpenSim.Region.Environment.Scenes
38{ 38{
39 partial class ScenePresence 39 partial class ScenePresence
40 { 40 {
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
index 45d3fed..96e5c94 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 37using OpenSim.Framework.Types;
38using Axiom.MathLib; 38using Axiom.MathLib;
39 39
40namespace OpenSim.Region.Scenes 40namespace OpenSim.Region.Environment.Scenes
41{ 41{
42 public partial class ScenePresence : Entity 42 public partial class ScenePresence : Entity
43 { 43 {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
index daa1b92..eb8a117 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Region.Scripting 33namespace OpenSim.Region.Environment.Scripting
34{ 34{
35 public interface IScriptContext 35 public interface IScriptContext
36 { 36 {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
index 44b886f..e813626 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Region.Scripting 33namespace OpenSim.Region.Environment.Scripting
34{ 34{
35 public interface IScriptReadonlyEntity 35 public interface IScriptReadonlyEntity
36 { 36 {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
index 797998d..115b4f4 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
@@ -30,12 +30,12 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Physics.Manager; 32using OpenSim.Physics.Manager;
33using OpenSim.Region; 33using OpenSim.Region.Environment;
34using OpenSim.Region.Scenes; 34using OpenSim.Region.Environment.Scenes;
35using Avatar=OpenSim.Region.Scenes.ScenePresence; 35using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
36using Primitive = OpenSim.Region.Scenes.Primitive; 36using Primitive = OpenSim.Region.Environment.Scenes.Primitive;
37 37
38namespace OpenSim.Region.Scripting 38namespace OpenSim.Region.Environment.Scripting
39{ 39{
40 public delegate void ScriptEventHandler(IScriptContext context); 40 public delegate void ScriptEventHandler(IScriptContext context);
41 41
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
index 1d01f3c..5d398b0 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Region.Scripting 33namespace OpenSim.Region.Environment.Scripting
34{ 34{
35 public class Script 35 public class Script
36 { 36 {
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
index 32ef046..0ce65ea 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31 31
32namespace OpenSim.Region.Scripting 32namespace OpenSim.Region.Environment.Scripting
33{ 33{
34 public delegate Script ScriptFactory(); 34 public delegate Script ScriptFactory();
35} 35}
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
index 21f07a8..90c79e3 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Region.Scripting 33namespace OpenSim.Region.Environment.Scripting
34{ 34{
35 public class FollowRandomAvatar : Script 35 public class FollowRandomAvatar : Script
36 { 36 {
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index ab3c34c..3bc6f25 100644
--- a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -39,7 +39,7 @@ using BerkeleyDb;
39using Kds.Serialization; 39using Kds.Serialization;
40using Kds.Serialization.Buffer; 40using Kds.Serialization.Buffer;
41 41
42namespace OpenSim.Storage.LocalStorageBDB 42namespace OpenSim.Region.Storage.LocalStorageBDB
43{ 43{
44 public class BDBLocalStorage : ILocalStorage 44 public class BDBLocalStorage : ILocalStorage
45 { 45 {
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 8e6b04d..5cb4861 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37 37
38 38
39namespace OpenSim.Storage.LocalStorageDb4o 39namespace OpenSim.Region.Storage.LocalStorageDb4o
40{ 40{
41 /// <summary> 41 /// <summary>
42 /// 42 ///
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
index 56387ac..22f3392 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31 31
32namespace OpenSim.Storage.LocalStorageDb4o 32namespace OpenSim.Region.Storage.LocalStorageDb4o
33{ 33{
34 public class MapStorage 34 public class MapStorage
35 { 35 {
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
index d24fb5f..dcbe639 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36 36
37namespace OpenSim.Storage.LocalStorageDb4o 37namespace OpenSim.Region.Storage.LocalStorageDb4o
38{ 38{
39 public class UUIDParcelQuery : Predicate 39 public class UUIDParcelQuery : Predicate
40 { 40 {
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
index b2e8a91..23de6dd 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -34,7 +34,7 @@ using libsecondlife;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36 36
37namespace OpenSim.Storage.LocalStorageDb4o 37namespace OpenSim.Region.Storage.LocalStorageDb4o
38{ 38{
39 public class UUIDPrimQuery : Predicate 39 public class UUIDPrimQuery : Predicate
40 { 40 {
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index b45debf..80158d5 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
32// General Information about an assembly is controlled through the following 32// General Information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 33// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 34// associated with an assembly.
35[assembly: AssemblyTitle("OpenSim.Storage.LocalStorageSQLite")] 35[assembly: AssemblyTitle("OpenSim.Region.Storage.LocalStorageSQLite")]
36[assembly: AssemblyDescription("")] 36[assembly: AssemblyDescription("")]
37[assembly: AssemblyConfiguration("")] 37[assembly: AssemblyConfiguration("")]
38[assembly: AssemblyCompany("")] 38[assembly: AssemblyCompany("")]
39[assembly: AssemblyProduct("OpenSim.Storage.LocalStorageSQLite")] 39[assembly: AssemblyProduct("OpenSim.Region.Storage.LocalStorageSQLite")]
40[assembly: AssemblyCopyright("Copyright © 2007")] 40[assembly: AssemblyCopyright("Copyright © 2007")]
41[assembly: AssemblyTrademark("")] 41[assembly: AssemblyTrademark("")]
42[assembly: AssemblyCulture("")] 42[assembly: AssemblyCulture("")]
diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 8a7893e..b407be4 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -37,7 +37,7 @@ using libsecondlife;
37using OpenSim.Framework.Interfaces; 37using OpenSim.Framework.Interfaces;
38using OpenSim.Framework.Types; 38using OpenSim.Framework.Types;
39 39
40namespace OpenSim.Storage.LocalStorageSQLite 40namespace OpenSim.Region.Storage.LocalStorageSQLite
41{ 41{
42 public class SQLiteLocalStorage : ILocalStorage 42 public class SQLiteLocalStorage : ILocalStorage
43 { 43 {
generated by cgit v1.1 at 2024-12-15 12:27:43 +0000