aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj19
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build13
-rw-r--r--Common/OpenSim.Framework/Types/AgentCircuitData.cs50
-rw-r--r--Common/OpenSim.Framework/Types/AgentCiruitData.cs22
-rw-r--r--Common/OpenSim.Framework/Types/AssetBase.cs27
-rw-r--r--Common/OpenSim.Framework/Types/AssetLandmark.cs27
-rw-r--r--Common/OpenSim.Framework/Types/AssetStorage.cs27
-rw-r--r--Common/OpenSim.Framework/Types/Login.cs28
-rw-r--r--Common/OpenSim.Framework/Types/NeighbourInfo.cs28
-rw-r--r--Common/OpenSim.Framework/Types/OSVector3.cs28
-rw-r--r--Common/OpenSim.Framework/Types/ParcelData.cs27
-rw-r--r--Common/OpenSim.Framework/Types/PrimData.cs28
-rw-r--r--OpenGridServices.sln134
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.csproj39
-rw-r--r--OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj32
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build12
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfo.cs12
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfoBase.cs33
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs34
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs3
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/World.cs6
23 files changed, 430 insertions, 209 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 8e33dd9..3059daa 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -159,31 +159,34 @@
159 <Compile Include="Properties\AssemblyInfo.cs"> 159 <Compile Include="Properties\AssemblyInfo.cs">
160 <SubType>Code</SubType> 160 <SubType>Code</SubType>
161 </Compile> 161 </Compile>
162 <Compile Include="Types\NeighbourInfo.cs"> 162 <Compile Include="Types\AgentCircuitData.cs">
163 <SubType>Code</SubType> 163 <SubType>Code</SubType>
164 </Compile> 164 </Compile>
165 <Compile Include="Types\ParcelData.cs"> 165 <Compile Include="Types\AssetBase.cs">
166 <SubType>Code</SubType> 166 <SubType>Code</SubType>
167 </Compile> 167 </Compile>
168 <Compile Include="Types\PrimData.cs"> 168 <Compile Include="Types\AssetLandmark.cs">
169 <SubType>Code</SubType> 169 <SubType>Code</SubType>
170 </Compile> 170 </Compile>
171 <Compile Include="Types\AssetStorage.cs"> 171 <Compile Include="Types\AssetStorage.cs">
172 <SubType>Code</SubType> 172 <SubType>Code</SubType>
173 </Compile> 173 </Compile>
174 <Compile Include="Types\OSVector3.cs"> 174 <Compile Include="Types\Login.cs">
175 <SubType>Code</SubType>
176 </Compile>
177 <Compile Include="Types\NeighbourInfo.cs">
175 <SubType>Code</SubType> 178 <SubType>Code</SubType>
176 </Compile> 179 </Compile>
177 <Compile Include="Types\AgentCiruitData.cs"> 180 <Compile Include="Types\OSVector3.cs">
178 <SubType>Code</SubType> 181 <SubType>Code</SubType>
179 </Compile> 182 </Compile>
180 <Compile Include="Types\Login.cs"> 183 <Compile Include="Types\ParcelData.cs">
181 <SubType>Code</SubType> 184 <SubType>Code</SubType>
182 </Compile> 185 </Compile>
183 <Compile Include="Types\AssetLandmark.cs"> 186 <Compile Include="Types\PrimData.cs">
184 <SubType>Code</SubType> 187 <SubType>Code</SubType>
185 </Compile> 188 </Compile>
186 <Compile Include="Types\AssetBase.cs"> 189 <Compile Include="Types\EstateSettings.cs">
187 <SubType>Code</SubType> 190 <SubType>Code</SubType>
188 </Compile> 191 </Compile>
189 </ItemGroup> 192 </ItemGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 8da7748..ae01398 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -36,15 +36,16 @@
36 <include name="Interfaces/IScriptAPI.cs" /> 36 <include name="Interfaces/IScriptAPI.cs" />
37 <include name="Interfaces/ILocalStorage.cs" /> 37 <include name="Interfaces/ILocalStorage.cs" />
38 <include name="Properties/AssemblyInfo.cs" /> 38 <include name="Properties/AssemblyInfo.cs" />
39 <include name="Types/AgentCircuitData.cs" />
40 <include name="Types/AssetBase.cs" />
41 <include name="Types/AssetLandmark.cs" />
42 <include name="Types/AssetStorage.cs" />
43 <include name="Types/Login.cs" />
39 <include name="Types/NeighbourInfo.cs" /> 44 <include name="Types/NeighbourInfo.cs" />
45 <include name="Types/OSVector3.cs" />
40 <include name="Types/ParcelData.cs" /> 46 <include name="Types/ParcelData.cs" />
41 <include name="Types/PrimData.cs" /> 47 <include name="Types/PrimData.cs" />
42 <include name="Types/AssetStorage.cs" /> 48 <include name="Types/EstateSettings.cs" />
43 <include name="Types/OSVector3.cs" />
44 <include name="Types/AgentCiruitData.cs" />
45 <include name="Types/Login.cs" />
46 <include name="Types/AssetLandmark.cs" />
47 <include name="Types/AssetBase.cs" />
48 </sources> 49 </sources>
49 <references basedir="${project::get-base-directory()}"> 50 <references basedir="${project::get-base-directory()}">
50 <lib> 51 <lib>
diff --git a/Common/OpenSim.Framework/Types/AgentCircuitData.cs b/Common/OpenSim.Framework/Types/AgentCircuitData.cs
new file mode 100644
index 0000000..de79ce2
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/AgentCircuitData.cs
@@ -0,0 +1,50 @@
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*/
28
29using System;
30using System.Collections.Generic;
31using System.Text;
32using libsecondlife;
33
34namespace OpenSim.Framework.Types
35{
36 public class AgentCircuitData
37 {
38 public AgentCircuitData() { }
39 public LLUUID AgentID;
40 public LLUUID SessionID;
41 public LLUUID SecureSessionID;
42 public LLVector3 startpos;
43 public string firstname;
44 public string lastname;
45 public uint circuitcode;
46 public bool child;
47 public LLUUID InventoryFolder;
48 public LLUUID BaseFolder;
49 }
50}
diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/Common/OpenSim.Framework/Types/AgentCiruitData.cs
deleted file mode 100644
index 7314586..0000000
--- a/Common/OpenSim.Framework/Types/AgentCiruitData.cs
+++ /dev/null
@@ -1,22 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.Framework.Types
7{
8 public class AgentCircuitData
9 {
10 public AgentCircuitData() { }
11 public LLUUID AgentID;
12 public LLUUID SessionID;
13 public LLUUID SecureSessionID;
14 public LLVector3 startpos;
15 public string firstname;
16 public string lastname;
17 public uint circuitcode;
18 public bool child;
19 public LLUUID InventoryFolder;
20 public LLUUID BaseFolder;
21 }
22}
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/Common/OpenSim.Framework/Types/AssetBase.cs
index f6104f8..86586a6 100644
--- a/Common/OpenSim.Framework/Types/AssetBase.cs
+++ b/Common/OpenSim.Framework/Types/AssetBase.cs
@@ -1,3 +1,30 @@
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*/
1using System; 28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Text; 30using System.Text;
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/Common/OpenSim.Framework/Types/AssetLandmark.cs
index 9d1a326..8a10b70 100644
--- a/Common/OpenSim.Framework/Types/AssetLandmark.cs
+++ b/Common/OpenSim.Framework/Types/AssetLandmark.cs
@@ -1,3 +1,30 @@
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*/
1using System; 28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Text; 30using System.Text;
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/Common/OpenSim.Framework/Types/AssetStorage.cs
index 5b5b3b2..8cac23a 100644
--- a/Common/OpenSim.Framework/Types/AssetStorage.cs
+++ b/Common/OpenSim.Framework/Types/AssetStorage.cs
@@ -1,3 +1,30 @@
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*/
1using System; 28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Text; 30using System.Text;
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/Common/OpenSim.Framework/Types/Login.cs
index 71f9de3..2737cbb 100644
--- a/Common/OpenSim.Framework/Types/Login.cs
+++ b/Common/OpenSim.Framework/Types/Login.cs
@@ -1,3 +1,31 @@
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*/
28
1using System; 29using System;
2using System.Collections.Generic; 30using System.Collections.Generic;
3using System.Text; 31using System.Text;
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/Common/OpenSim.Framework/Types/NeighbourInfo.cs
index 58b6cb1..e3e9dbb 100644
--- a/Common/OpenSim.Framework/Types/NeighbourInfo.cs
+++ b/Common/OpenSim.Framework/Types/NeighbourInfo.cs
@@ -1,3 +1,31 @@
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*/
28
1using System; 29using System;
2using System.Collections.Generic; 30using System.Collections.Generic;
3using System.Text; 31using System.Text;
diff --git a/Common/OpenSim.Framework/Types/OSVector3.cs b/Common/OpenSim.Framework/Types/OSVector3.cs
index 8fb840b..7e3a849 100644
--- a/Common/OpenSim.Framework/Types/OSVector3.cs
+++ b/Common/OpenSim.Framework/Types/OSVector3.cs
@@ -1,3 +1,31 @@
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*/
28
1using System; 29using System;
2using System.Collections.Generic; 30using System.Collections.Generic;
3using System.Text; 31using System.Text;
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/Common/OpenSim.Framework/Types/ParcelData.cs
index 53dbbbd..40f128a 100644
--- a/Common/OpenSim.Framework/Types/ParcelData.cs
+++ b/Common/OpenSim.Framework/Types/ParcelData.cs
@@ -1,3 +1,30 @@
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*/
1using System; 28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Text; 30using System.Text;
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/Common/OpenSim.Framework/Types/PrimData.cs
index 68e2a22..a63be76 100644
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ b/Common/OpenSim.Framework/Types/PrimData.cs
@@ -1,3 +1,31 @@
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*/
28
1using System; 29using System;
2using System.Collections.Generic; 30using System.Collections.Generic;
3using System.Text; 31using System.Text;
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 4bcb988..87f3570 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual C# Express 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}"
@@ -27,75 +27,65 @@ EndProject
27Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" 27Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}"
28EndProject 28EndProject
29Global 29Global
30 GlobalSection(SolutionConfigurationPlatforms) = preSolution 30 GlobalSection(SolutionConfigurationPlatforms) = preSolution
31 Debug|Any CPU = Debug|Any CPU 31 Debug|Any CPU = Debug|Any CPU
32 Release|Any CPU = Release|Any CPU 32 Release|Any CPU = Release|Any CPU
33 EndGlobalSection 33 EndGlobalSection
34 GlobalSection(ProjectDependencies) = postSolution 34 GlobalSection(ProjectConfigurationPlatforms) = postSolution
35 ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) 35 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36 ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) 36 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
37 ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) 37 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
38 ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000}) 38 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
39 ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) 39 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40 ({338FA00B-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) 40 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
41 ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000}) 41 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
42 ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) 42 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
43 EndGlobalSection 43 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44 GlobalSection(ProjectConfigurationPlatforms) = postSolution 44 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
45 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 45 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
46 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 46 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
47 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 47 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 48 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
49 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 49 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
50 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 50 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
51 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 51 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 52 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
53 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 53 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
54 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 54 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
55 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 55 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 56 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
57 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 57 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
58 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 58 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
59 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 59 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 60 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
61 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 61 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
62 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 62 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
63 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 63 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 64 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
65 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 65 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
66 {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 66 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
67 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 67 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68 {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 68 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
69 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 69 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
70 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 70 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
71 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 71 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 72 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
73 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 73 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
74 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 74 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
75 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 75 {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 76 {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
77 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 77 {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
78 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 78 {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
79 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 79 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 80 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
81 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 81 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
82 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 82 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
83 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 83 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 84 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
85 {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 85 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
86 {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 86 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
87 {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 87 EndGlobalSection
88 {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 88 GlobalSection(SolutionProperties) = preSolution
89 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 89 HideSolutionNode = FALSE
90 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 90 EndGlobalSection
91 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
92 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
93 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
95 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
96 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
97 EndGlobalSection
98 GlobalSection(SolutionProperties) = preSolution
99 HideSolutionNode = FALSE
100 EndGlobalSection
101EndGlobal 91EndGlobal
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
index 0e7ff5a..b461bd1 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ b/OpenGridServices/ServiceManager/ServiceManager.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>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{E141F4EE-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>ServiceManager</AssemblyName> 13 <AssemblyName>ServiceManager</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>ServiceManager</RootNamespace> 21 <RootNamespace>ServiceManager</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="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.ServiceProcess" > 72 <Reference Include="System.ServiceProcess">
66 <HintPath>System.ServiceProcess.dll</HintPath> 73 <HintPath>System.ServiceProcess.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Xml" > 76 <Reference Include="System.Xml">
70 <HintPath>System.Xml.dll</HintPath> 77 <HintPath>System.Xml.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="libsecondlife.dll" > 80 <Reference Include="libsecondlife.dll">
74 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 81 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
77 <Reference Include="OpenSim.GenericConfig.Xml" > 84 <Reference Include="OpenSim.GenericConfig.Xml">
78 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath> 85 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
79 <Private>False</Private> 86 <Private>False</Private>
80 </Reference> 87 </Reference>
81 <Reference Include="OpenSim.Framework.dll" > 88 <Reference Include="OpenSim.Framework.dll">
82 <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath> 89 <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>
83 <Private>False</Private> 90 <Private>False</Private>
84 </Reference> 91 </Reference>
@@ -87,7 +94,7 @@
87 </ItemGroup> 94 </ItemGroup>
88 <ItemGroup> 95 <ItemGroup>
89 <Compile Include="ServiceManager.cs"> 96 <Compile Include="ServiceManager.cs">
90 <SubType>Code</SubType> 97 <SubType>Component</SubType>
91 </Compile> 98 </Compile>
92 </ItemGroup> 99 </ItemGroup>
93 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 100 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
@@ -97,4 +104,4 @@
97 <PostBuildEvent> 104 <PostBuildEvent>
98 </PostBuildEvent> 105 </PostBuildEvent>
99 </PropertyGroup> 106 </PropertyGroup>
100</Project> 107</Project> \ No newline at end of file
diff --git a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
index 7ddfcd2..5dab080 100644
--- a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
@@ -2,8 +2,13 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5using OpenSim.Framework.Types;
6
5namespace OpenSim.RegionServer.Estate 7namespace OpenSim.RegionServer.Estate
6{ 8{
9 /// <summary>
10 /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
11 /// </summary>
7 public class EstateManager 12 public class EstateManager
8 { 13 {
9 14
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index aa7ce5d..4f16f2c 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -142,15 +142,9 @@
142 <Compile Include="Grid.cs"> 142 <Compile Include="Grid.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="RegionInfoBase.cs">
146 <SubType>Code</SubType>
147 </Compile>
148 <Compile Include="PacketServer.cs"> 145 <Compile Include="PacketServer.cs">
149 <SubType>Code</SubType> 146 <SubType>Code</SubType>
150 </Compile> 147 </Compile>
151 <Compile Include="RegionInfo.cs">
152 <SubType>Code</SubType>
153 </Compile>
154 <Compile Include="AuthenticateSessionsBase.cs"> 148 <Compile Include="AuthenticateSessionsBase.cs">
155 <SubType>Code</SubType> 149 <SubType>Code</SubType>
156 </Compile> 150 </Compile>
@@ -163,13 +157,16 @@
163 <Compile Include="RegionServerBase.cs"> 157 <Compile Include="RegionServerBase.cs">
164 <SubType>Code</SubType> 158 <SubType>Code</SubType>
165 </Compile> 159 </Compile>
166 <Compile Include="Simulator\Avatar.Client.cs"> 160 <Compile Include="RegionInfoBase.cs">
167 <SubType>Code</SubType> 161 <SubType>Code</SubType>
168 </Compile> 162 </Compile>
169 <Compile Include="Simulator\Entity.cs"> 163 <Compile Include="RegionInfo.cs">
170 <SubType>Code</SubType> 164 <SubType>Code</SubType>
171 </Compile> 165 </Compile>
172 <Compile Include="Simulator\Avatar.cs"> 166 <Compile Include="Simulator\Avatar.Client.cs">
167 <SubType>Code</SubType>
168 </Compile>
169 <Compile Include="Simulator\Entity.cs">
173 <SubType>Code</SubType> 170 <SubType>Code</SubType>
174 </Compile> 171 </Compile>
175 <Compile Include="Simulator\World.PacketHandlers.cs"> 172 <Compile Include="Simulator\World.PacketHandlers.cs">
@@ -181,25 +178,28 @@
181 <Compile Include="Simulator\AvatarAnimations.cs"> 178 <Compile Include="Simulator\AvatarAnimations.cs">
182 <SubType>Code</SubType> 179 <SubType>Code</SubType>
183 </Compile> 180 </Compile>
184 <Compile Include="Simulator\ParcelManager.cs"> 181 <Compile Include="Simulator\WorldBase.cs">
185 <SubType>Code</SubType> 182 <SubType>Code</SubType>
186 </Compile> 183 </Compile>
187 <Compile Include="Simulator\WorldBase.cs"> 184 <Compile Include="Simulator\Primitive.cs">
188 <SubType>Code</SubType> 185 <SubType>Code</SubType>
189 </Compile> 186 </Compile>
190 <Compile Include="Simulator\SceneObject.cs"> 187 <Compile Include="Simulator\World.Scripting.cs">
191 <SubType>Code</SubType> 188 <SubType>Code</SubType>
192 </Compile> 189 </Compile>
193 <Compile Include="Simulator\World.cs"> 190 <Compile Include="Simulator\Primitive2.cs">
194 <SubType>Code</SubType> 191 <SubType>Code</SubType>
195 </Compile> 192 </Compile>
196 <Compile Include="Simulator\Primitive.cs"> 193 <Compile Include="Simulator\Avatar.cs">
197 <SubType>Code</SubType> 194 <SubType>Code</SubType>
198 </Compile> 195 </Compile>
199 <Compile Include="Simulator\World.Scripting.cs"> 196 <Compile Include="Simulator\World.cs">
200 <SubType>Code</SubType> 197 <SubType>Code</SubType>
201 </Compile> 198 </Compile>
202 <Compile Include="Simulator\Primitive2.cs"> 199 <Compile Include="Simulator\SceneObject.cs">
200 <SubType>Code</SubType>
201 </Compile>
202 <Compile Include="Simulator\ParcelManager.cs">
203 <SubType>Code</SubType> 203 <SubType>Code</SubType>
204 </Compile> 204 </Compile>
205 <Compile Include="Estate\EstateManager.cs"> 205 <Compile Include="Estate\EstateManager.cs">
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 204796e..702c90c 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -17,26 +17,26 @@
17 <include name="AuthenticateSessionsRemote.cs" /> 17 <include name="AuthenticateSessionsRemote.cs" />
18 <include name="OpenSimNetworkHandler.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
19 <include name="Grid.cs" /> 19 <include name="Grid.cs" />
20 <include name="RegionInfoBase.cs" />
21 <include name="PacketServer.cs" /> 20 <include name="PacketServer.cs" />
22 <include name="RegionInfo.cs" />
23 <include name="AuthenticateSessionsBase.cs" /> 21 <include name="AuthenticateSessionsBase.cs" />
24 <include name="VersionInfo.cs" /> 22 <include name="VersionInfo.cs" />
25 <include name="AgentAssetUpload.cs" /> 23 <include name="AgentAssetUpload.cs" />
26 <include name="RegionServerBase.cs" /> 24 <include name="RegionServerBase.cs" />
25 <include name="RegionInfoBase.cs" />
26 <include name="RegionInfo.cs" />
27 <include name="Simulator/Avatar.Client.cs" /> 27 <include name="Simulator/Avatar.Client.cs" />
28 <include name="Simulator/Entity.cs" /> 28 <include name="Simulator/Entity.cs" />
29 <include name="Simulator/Avatar.cs" />
30 <include name="Simulator/World.PacketHandlers.cs" /> 29 <include name="Simulator/World.PacketHandlers.cs" />
31 <include name="Simulator/Avatar.Update.cs" /> 30 <include name="Simulator/Avatar.Update.cs" />
32 <include name="Simulator/AvatarAnimations.cs" /> 31 <include name="Simulator/AvatarAnimations.cs" />
33 <include name="Simulator/ParcelManager.cs" />
34 <include name="Simulator/WorldBase.cs" /> 32 <include name="Simulator/WorldBase.cs" />
35 <include name="Simulator/SceneObject.cs" />
36 <include name="Simulator/World.cs" />
37 <include name="Simulator/Primitive.cs" /> 33 <include name="Simulator/Primitive.cs" />
38 <include name="Simulator/World.Scripting.cs" /> 34 <include name="Simulator/World.Scripting.cs" />
39 <include name="Simulator/Primitive2.cs" /> 35 <include name="Simulator/Primitive2.cs" />
36 <include name="Simulator/Avatar.cs" />
37 <include name="Simulator/World.cs" />
38 <include name="Simulator/SceneObject.cs" />
39 <include name="Simulator/ParcelManager.cs" />
40 <include name="Estate/EstateManager.cs" /> 40 <include name="Estate/EstateManager.cs" />
41 <include name="CAPS/AdminWebFront.cs" /> 41 <include name="CAPS/AdminWebFront.cs" />
42 <include name="Assets/InventoryCache.cs" /> 42 <include name="Assets/InventoryCache.cs" />
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index f14fd3f..de1750c 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -232,12 +232,12 @@ namespace OpenSim.RegionServer
232 attri = configData.GetAttribute("TerrainFile"); 232 attri = configData.GetAttribute("TerrainFile");
233 if (attri == "") 233 if (attri == "")
234 { 234 {
235 this.TerrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32"); 235 this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
236 configData.SetAttribute("TerrainFile", this.TerrainFile); 236 configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
237 } 237 }
238 else 238 else
239 { 239 {
240 this.TerrainFile = attri; 240 this.estateSettings.terrainFile = attri;
241 } 241 }
242 242
243 attri = ""; 243 attri = "";
@@ -245,12 +245,12 @@ namespace OpenSim.RegionServer
245 if (attri == "") 245 if (attri == "")
246 { 246 {
247 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0"); 247 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
248 this.TerrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); 248 this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
249 configData.SetAttribute("TerrainMultiplier", this.TerrainMultiplier.ToString()); 249 configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
250 } 250 }
251 else 251 else
252 { 252 {
253 this.TerrainMultiplier = Convert.ToDouble(attri); 253 this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
254 } 254 }
255 255
256 attri = ""; 256 attri = "";
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
index 8622857..a18c05f 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs
@@ -33,6 +33,7 @@ using System.Web;
33using System.IO; 33using System.IO;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Utilities; 35using OpenSim.Framework.Utilities;
36using OpenSim.Framework.Types;
36using libsecondlife; 37using libsecondlife;
37 38
38namespace OpenSim.RegionServer 39namespace OpenSim.RegionServer
@@ -44,41 +45,13 @@ namespace OpenSim.RegionServer
44 public uint RegionLocX; 45 public uint RegionLocX;
45 public uint RegionLocY; 46 public uint RegionLocY;
46 public ulong RegionHandle; 47 public ulong RegionHandle;
47 public ushort RegionWaterHeight = 20; 48
48 public bool RegionTerraform = true;
49 public LLUUID RegionOwner = new LLUUID();
50 49
51 public int IPListenPort; 50 public int IPListenPort;
52 public string IPListenAddr; 51 public string IPListenAddr;
53 52
54 // Region Information
55 // Low resolution 'base' textures. No longer used.
56 public LLUUID TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default
57 public LLUUID TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default
58 public LLUUID TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default
59 public LLUUID TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default
60 // Higher resolution terrain textures
61 public LLUUID TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
62 public LLUUID TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
63 public LLUUID TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
64 public LLUUID TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
65 // First quad - each point is bilinearly interpolated at each meter of terrain
66 public float TerrainStartHeight00 = 10.0f; // NW Corner ( I think )
67 public float TerrainStartHeight01 = 10.0f; // NE Corner ( I think )
68 public float TerrainStartHeight10 = 10.0f; // SW Corner ( I think )
69 public float TerrainStartHeight11 = 10.0f; // SE Corner ( I think )
70 // Second quad - also bilinearly interpolated.
71 // Terrain texturing is done that:
72 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
73 public float TerrainHeightRange00 = 60.0f;
74 public float TerrainHeightRange01 = 60.0f;
75 public float TerrainHeightRange10 = 60.0f;
76 public float TerrainHeightRange11 = 60.0f;
77
78 // Terrain Default (Must be in F32 Format!)
79 public string TerrainFile = "default.r32";
80 public double TerrainMultiplier = 60.0;
81 53
54 public EstateSettings estateSettings;
82 55
83 public RegionInfoBase() 56 public RegionInfoBase()
84 { 57 {
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
index 0135e26..65a9a63 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs
@@ -425,14 +425,14 @@ namespace OpenSim.RegionServer.Simulator
425 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); 425 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
426 handshake.RegionInfo.BillableFactor = 0; 426 handshake.RegionInfo.BillableFactor = 0;
427 handshake.RegionInfo.IsEstateManager = false; 427 handshake.RegionInfo.IsEstateManager = false;
428 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.TerrainHeightRange00; 428 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeNW;
429 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.m_regInfo.TerrainHeightRange01; 429 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeNE;
430 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.m_regInfo.TerrainHeightRange10; 430 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeSW;
431 handshake.RegionInfo.TerrainHeightRange11 = regionInfo.m_regInfo.TerrainHeightRange11; 431 handshake.RegionInfo.TerrainHeightRange11 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeSE;
432 handshake.RegionInfo.TerrainStartHeight00 = regionInfo.m_regInfo.TerrainStartHeight00; 432 handshake.RegionInfo.TerrainStartHeight00 = regionInfo.m_regInfo.estateSettings.terrainStartHeightNW;
433 handshake.RegionInfo.TerrainStartHeight01 = regionInfo.m_regInfo.TerrainStartHeight01; 433 handshake.RegionInfo.TerrainStartHeight01 = regionInfo.m_regInfo.estateSettings.terrainStartHeightNE;
434 handshake.RegionInfo.TerrainStartHeight10 = regionInfo.m_regInfo.TerrainStartHeight10; 434 handshake.RegionInfo.TerrainStartHeight10 = regionInfo.m_regInfo.estateSettings.terrainStartHeightSW;
435 handshake.RegionInfo.TerrainStartHeight11 = regionInfo.m_regInfo.TerrainStartHeight11; 435 handshake.RegionInfo.TerrainStartHeight11 = regionInfo.m_regInfo.estateSettings.terrainStartHeightSE;
436 handshake.RegionInfo.SimAccess = 13; 436 handshake.RegionInfo.SimAccess = 13;
437 handshake.RegionInfo.WaterHeight = m_regionWaterHeight; 437 handshake.RegionInfo.WaterHeight = m_regionWaterHeight;
438 uint regionFlags = 72458694; 438 uint regionFlags = 72458694;
@@ -442,15 +442,15 @@ namespace OpenSim.RegionServer.Simulator
442 } 442 }
443 handshake.RegionInfo.RegionFlags = regionFlags; 443 handshake.RegionInfo.RegionFlags = regionFlags;
444 handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); 444 handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0");
445 handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); 445 handshake.RegionInfo.SimOwner = regionInfo.m_regInfo.MasterAvatarAssignedUUID;
446 handshake.RegionInfo.TerrainBase0 = regionInfo.m_regInfo.TerrainBase0; 446 handshake.RegionInfo.TerrainBase0 = regionInfo.m_regInfo.estateSettings.terrainBase0;
447 handshake.RegionInfo.TerrainBase1 = regionInfo.m_regInfo.TerrainBase1; 447 handshake.RegionInfo.TerrainBase1 = regionInfo.m_regInfo.estateSettings.terrainBase1;
448 handshake.RegionInfo.TerrainBase2 = regionInfo.m_regInfo.TerrainBase2; 448 handshake.RegionInfo.TerrainBase2 = regionInfo.m_regInfo.estateSettings.terrainBase2;
449 handshake.RegionInfo.TerrainBase3 = regionInfo.m_regInfo.TerrainBase3; 449 handshake.RegionInfo.TerrainBase3 = regionInfo.m_regInfo.estateSettings.terrainBase3;
450 handshake.RegionInfo.TerrainDetail0 = regionInfo.m_regInfo.TerrainDetail0; 450 handshake.RegionInfo.TerrainDetail0 = regionInfo.m_regInfo.estateSettings.terrainDetail0;
451 handshake.RegionInfo.TerrainDetail1 = regionInfo.m_regInfo.TerrainDetail1; 451 handshake.RegionInfo.TerrainDetail1 = regionInfo.m_regInfo.estateSettings.terrainDetail1;
452 handshake.RegionInfo.TerrainDetail2 = regionInfo.m_regInfo.TerrainDetail2; 452 handshake.RegionInfo.TerrainDetail2 = regionInfo.m_regInfo.estateSettings.terrainDetail2;
453 handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.TerrainDetail3; 453 handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.estateSettings.terrainDetail3;
454 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); 454 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
455 455
456 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet"); 456 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
index a9d4eea..6d432f1 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
@@ -284,7 +284,6 @@ namespace OpenSim.RegionServer.Simulator
284 { 284 {
285 end_x -= 4; 285 end_x -= 4;
286 end_y -= 4; 286 end_y -= 4;
287 Console.WriteLine("Joining Parcels between (" + start_x + ", " + start_y + ") and (" + end_x + ", " + end_y + ")");
288 287
289 //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box! 288 //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
290 //This should be fixed later -- somewhat "incomplete code" --Ming 289 //This should be fixed later -- somewhat "incomplete code" --Ming
@@ -315,7 +314,6 @@ namespace OpenSim.RegionServer.Simulator
315 return false; 314 return false;
316 } 315 }
317 316
318 Console.WriteLine("Performing Join on parcel: " + startParcel.parcelData.parcelName + " - " + startParcel.parcelData.area + "sqm and " + endParcel.parcelData.parcelName + " - " + endParcel.parcelData.area + "sqm");
319 //Same owners! Lets join them 317 //Same owners! Lets join them
320 //Merge them to startParcel 318 //Merge them to startParcel
321 parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap())); 319 parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
@@ -573,7 +571,6 @@ namespace OpenSim.RegionServer.Simulator
573 if (remote_client.AgentID == parcelData.ownerID) 571 if (remote_client.AgentID == parcelData.ownerID)
574 { 572 {
575 //Needs later group support 573 //Needs later group support
576 Console.WriteLine("Request for update - parcel #" + parcelData.localID);
577 parcelData.authBuyerID = packet.ParcelData.AuthBuyerID; 574 parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
578 parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category; 575 parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
579 parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc); 576 parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs b/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
index 1ef91c9..ce2b50d 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/SceneObject.cs
@@ -41,11 +41,8 @@ namespace OpenSim.RegionServer.Simulator
41{ 41{
42 public class SceneObject : Entity 42 public class SceneObject : Entity
43 { 43 {
44 private LLUUID rootUUID;
45 private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>(); 44 private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();
46 private Dictionary<uint, ClientView> m_clientThreads; 45
47 private World m_world;
48
49 public SceneObject() 46 public SceneObject()
50 { 47 {
51 48
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
index 150a092..b4e4f49 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/World.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
@@ -463,7 +463,7 @@ namespace OpenSim.RegionServer.Simulator
463 float[] map = this.localStorage.LoadWorld(); 463 float[] map = this.localStorage.LoadWorld();
464 if (map == null) 464 if (map == null)
465 { 465 {
466 if (string.IsNullOrEmpty(this.m_regInfo.TerrainFile)) 466 if (string.IsNullOrEmpty(this.m_regInfo.estateSettings.terrainFile))
467 { 467 {
468 Console.WriteLine("No default terrain, procedurally generating..."); 468 Console.WriteLine("No default terrain, procedurally generating...");
469 this.Terrain.hills(); 469 this.Terrain.hills();
@@ -474,8 +474,8 @@ namespace OpenSim.RegionServer.Simulator
474 { 474 {
475 try 475 try
476 { 476 {
477 this.Terrain.loadFromFileF32(this.m_regInfo.TerrainFile); 477 this.Terrain.loadFromFileF32(this.m_regInfo.estateSettings.terrainFile);
478 this.Terrain *= this.m_regInfo.TerrainMultiplier; 478 this.Terrain *= this.m_regInfo.estateSettings.terrainMultiplier;
479 } 479 }
480 catch (Exception e) 480 catch (Exception e)
481 { 481 {
generated by cgit v1.1 at 2024-07-16 19:27:59 +0000