diff options
author | mingchen | 2007-06-27 16:39:11 +0000 |
---|---|---|
committer | mingchen | 2007-06-27 16:39:11 +0000 |
commit | e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4 (patch) | |
tree | 7c9dbb6c56ff04a12c10e551629d9f6f40af9cf8 /OpenSim/Region/Simulation | |
parent | Some work on restructuring the namespaces / project names. Note this doesn't ... (diff) | |
download | opensim-SC-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.zip opensim-SC-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.gz opensim-SC-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.bz2 opensim-SC-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.xz |
*Some more restructuring/fixing -- should compile, but high chance I forgot to add/remove something
Diffstat (limited to 'OpenSim/Region/Simulation')
24 files changed, 82 insertions, 87 deletions
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; | |||
4 | using System.Text; | 4 | using System.Text; |
5 | using System.IO; | 5 | using System.IO; |
6 | using System.Xml; | 6 | using System.Xml; |
7 | using OpenSim.Servers; | 7 | using OpenSim.Framework.Servers; |
8 | using OpenSim.Framework; | 8 | using OpenSim.Framework; |
9 | using OpenSim.Framework.Utilities; | 9 | using OpenSim.Framework.Utilities; |
10 | using OpenSim.Framework.Types; | 10 | using OpenSim.Framework.Types; |
11 | using OpenSim.Caches; | 11 | using OpenSim.Region.Caches; |
12 | using libsecondlife; | 12 | using libsecondlife; |
13 | 13 | ||
14 | namespace OpenSim.Region | 14 | namespace 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; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenSim.Framework.Types; | 31 | using OpenSim.Framework.Types; |
32 | using OpenSim.Framework.Interfaces; | 32 | using OpenSim.Framework.Interfaces; |
33 | using OpenSim.Region; | 33 | using OpenSim.Region.Environment; |
34 | using OpenSim.Region.Scenes; | 34 | using OpenSim.Region.Environment.Scenes; |
35 | using OpenSim; | 35 | using OpenSim; |
36 | using libsecondlife; | 36 | using libsecondlife; |
37 | using libsecondlife.Packets; | 37 | using libsecondlife.Packets; |
38 | using Avatar = OpenSim.Region.Scenes.ScenePresence; | 38 | using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence; |
39 | 39 | ||
40 | 40 | ||
41 | namespace OpenSim.Region | 41 | namespace 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; | |||
32 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
33 | using OpenSim.Framework.Interfaces; | 33 | using OpenSim.Framework.Interfaces; |
34 | using OpenSim.Framework.Types; | 34 | using OpenSim.Framework.Types; |
35 | using OpenSim.Region.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
36 | using Avatar = OpenSim.Region.Scenes.ScenePresence; | 36 | using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence; |
37 | 37 | ||
38 | namespace OpenSim.Region | 38 | namespace 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 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenGrid.Framework.Communications; | 4 | using OpenSim.Framework.Communications; |
5 | using OpenSim.Framework; | 5 | using OpenSim.Framework; |
6 | using OpenSim.Framework.Types; | 6 | using OpenSim.Framework.Types; |
7 | using OpenSim.Servers; | 7 | using OpenSim.Framework.Servers; |
8 | 8 | ||
9 | namespace OpenSim.Region | 9 | namespace 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; | |||
31 | using Axiom.MathLib; | 31 | using Axiom.MathLib; |
32 | using OpenSim.Physics.Manager; | 32 | using OpenSim.Physics.Manager; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using OpenSim.Region.Scripting; | 34 | using OpenSim.Region.Environment.Scripting; |
35 | 35 | ||
36 | namespace OpenSim.Region.Scenes | 36 | namespace 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; | |||
7 | using OpenSim.Framework.Interfaces; | 7 | using OpenSim.Framework.Interfaces; |
8 | using OpenSim.Framework.Types; | 8 | using OpenSim.Framework.Types; |
9 | 9 | ||
10 | namespace OpenSim.Region.Scenes | 10 | namespace 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; | |||
36 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
37 | using OpenSim.Framework.Inventory; | 37 | using OpenSim.Framework.Inventory; |
38 | 38 | ||
39 | namespace OpenSim.Region.Scenes | 39 | namespace 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; | |||
36 | using OpenSim.Framework.Inventory; | 36 | using OpenSim.Framework.Inventory; |
37 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
38 | 38 | ||
39 | namespace OpenSim.Region.Scenes | 39 | namespace 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; | |||
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | using libsecondlife; | 36 | using libsecondlife; |
37 | 37 | ||
38 | namespace OpenSim.Region.Scenes | 38 | namespace 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; | |||
39 | using OpenSim.Framework.Types; | 39 | using OpenSim.Framework.Types; |
40 | using OpenSim.Framework.Inventory; | 40 | using OpenSim.Framework.Inventory; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Region.Scripting; | 42 | using OpenSim.Region.Environment.Scripting; |
43 | using OpenSim.Terrain; | 43 | using OpenSim.Terrain; |
44 | using OpenGrid.Framework.Communications; | 44 | using OpenSim.Framework.Communications; |
45 | using OpenSim.Caches; | 45 | using OpenSim.Region.Caches; |
46 | using OpenSim.Region; | 46 | using OpenSim.Region.Environment; |
47 | using OpenSim.Servers; | 47 | using OpenSim.Framework.Servers; |
48 | 48 | ||
49 | namespace OpenSim.Region.Scenes | 49 | namespace 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; | |||
37 | using OpenSim.Framework.Interfaces; | 37 | using OpenSim.Framework.Interfaces; |
38 | using OpenSim.Framework.Types; | 38 | using OpenSim.Framework.Types; |
39 | using OpenSim.Framework.Inventory; | 39 | using OpenSim.Framework.Inventory; |
40 | using OpenSim.Region.Scripting; | 40 | using OpenSim.Region.Environment.Scripting; |
41 | using OpenSim.Terrain; | 41 | using OpenSim.Terrain; |
42 | using OpenSim.Caches; | 42 | using OpenSim.Region.Caches; |
43 | 43 | ||
44 | namespace OpenSim.Region.Scenes | 44 | namespace 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; | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | 4 | ||
5 | namespace OpenSim.Region.Scenes | 5 | namespace 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; | |||
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | using OpenSim.Framework.Inventory; | 36 | using OpenSim.Framework.Inventory; |
37 | 37 | ||
38 | namespace OpenSim.Region.Scenes | 38 | namespace 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; | |||
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | 33 | ||
34 | namespace OpenSim.Region.Scenes | 34 | namespace 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; | |||
34 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | 36 | ||
37 | namespace OpenSim.Region.Scenes | 37 | namespace 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; | |||
37 | using OpenSim.Framework.Types; | 37 | using OpenSim.Framework.Types; |
38 | using Axiom.MathLib; | 38 | using Axiom.MathLib; |
39 | 39 | ||
40 | namespace OpenSim.Region.Scenes | 40 | namespace 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; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | 32 | ||
33 | namespace OpenSim.Region.Scripting | 33 | namespace 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; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | 32 | ||
33 | namespace OpenSim.Region.Scripting | 33 | namespace 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; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using OpenSim.Physics.Manager; | 32 | using OpenSim.Physics.Manager; |
33 | using OpenSim.Region; | 33 | using OpenSim.Region.Environment; |
34 | using OpenSim.Region.Scenes; | 34 | using OpenSim.Region.Environment.Scenes; |
35 | using Avatar=OpenSim.Region.Scenes.ScenePresence; | 35 | using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence; |
36 | using Primitive = OpenSim.Region.Scenes.Primitive; | 36 | using Primitive = OpenSim.Region.Environment.Scenes.Primitive; |
37 | 37 | ||
38 | namespace OpenSim.Region.Scripting | 38 | namespace 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; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | 32 | ||
33 | namespace OpenSim.Region.Scripting | 33 | namespace 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; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | namespace OpenSim.Region.Scripting | 32 | namespace 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; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | 32 | ||
33 | namespace OpenSim.Region.Scripting | 33 | namespace OpenSim.Region.Environment.Scripting |
34 | { | 34 | { |
35 | public class FollowRandomAvatar : Script | 35 | public class FollowRandomAvatar : Script |
36 | { | 36 | { |