diff options
author | mingchen | 2007-06-08 03:54:03 +0000 |
---|---|---|
committer | mingchen | 2007-06-08 03:54:03 +0000 |
commit | 269ff893df525ad5ea8ad8fbe2528f7045dec8d9 (patch) | |
tree | 6b3957c356c76a59b360bf938ddea9c64932a26e | |
parent | *Added basic support for EstateOwnerMessage (diff) | |
download | opensim-SC-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.zip opensim-SC-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.tar.gz opensim-SC-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.tar.bz2 opensim-SC-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.tar.xz |
*Added Estate Tools for terrain texturing, terrain texturing heights per corner, water height, region flags, etc basic settings
*Parcel now sends ParcelProperties when the owner changes information as soon as the information is changed
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.csproj | 4 | ||||
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.dll.build | 4 | ||||
-rw-r--r-- | Common/OpenSim.Framework/Types/EstateSettings.cs | 23 | ||||
-rw-r--r-- | OpenGridServices.sln | 134 | ||||
-rw-r--r-- | OpenGridServices/ServiceManager/ServiceManager.csproj | 39 | ||||
-rw-r--r-- | OpenSim.sln | 203 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Client/ClientView.cs | 1 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs | 271 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | 20 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | 8 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs | 8 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs | 61 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Simulator/World.cs | 19 | ||||
-rw-r--r-- | OpenSim/OpenSim/OpenSim.csproj | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim/OpenSim.exe.build | 2 |
16 files changed, 520 insertions, 291 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index 3059daa..f481d2e 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj | |||
@@ -159,7 +159,7 @@ | |||
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\AgentCircuitData.cs"> | 162 | <Compile Include="Types\EstateSettings.cs"> |
163 | <SubType>Code</SubType> | 163 | <SubType>Code</SubType> |
164 | </Compile> | 164 | </Compile> |
165 | <Compile Include="Types\AssetBase.cs"> | 165 | <Compile Include="Types\AssetBase.cs"> |
@@ -186,7 +186,7 @@ | |||
186 | <Compile Include="Types\PrimData.cs"> | 186 | <Compile Include="Types\PrimData.cs"> |
187 | <SubType>Code</SubType> | 187 | <SubType>Code</SubType> |
188 | </Compile> | 188 | </Compile> |
189 | <Compile Include="Types\EstateSettings.cs"> | 189 | <Compile Include="Types\AgentCircuitData.cs"> |
190 | <SubType>Code</SubType> | 190 | <SubType>Code</SubType> |
191 | </Compile> | 191 | </Compile> |
192 | </ItemGroup> | 192 | </ItemGroup> |
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index ae01398..7577fd1 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -36,7 +36,7 @@ | |||
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" /> | 39 | <include name="Types/EstateSettings.cs" /> |
40 | <include name="Types/AssetBase.cs" /> | 40 | <include name="Types/AssetBase.cs" /> |
41 | <include name="Types/AssetLandmark.cs" /> | 41 | <include name="Types/AssetLandmark.cs" /> |
42 | <include name="Types/AssetStorage.cs" /> | 42 | <include name="Types/AssetStorage.cs" /> |
@@ -45,7 +45,7 @@ | |||
45 | <include name="Types/OSVector3.cs" /> | 45 | <include name="Types/OSVector3.cs" /> |
46 | <include name="Types/ParcelData.cs" /> | 46 | <include name="Types/ParcelData.cs" /> |
47 | <include name="Types/PrimData.cs" /> | 47 | <include name="Types/PrimData.cs" /> |
48 | <include name="Types/EstateSettings.cs" /> | 48 | <include name="Types/AgentCircuitData.cs" /> |
49 | </sources> | 49 | </sources> |
50 | <references basedir="${project::get-base-directory()}"> | 50 | <references basedir="${project::get-base-directory()}"> |
51 | <lib> | 51 | <lib> |
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/Common/OpenSim.Framework/Types/EstateSettings.cs index b34a1ac..baa3eef 100644 --- a/Common/OpenSim.Framework/Types/EstateSettings.cs +++ b/Common/OpenSim.Framework/Types/EstateSettings.cs | |||
@@ -46,15 +46,14 @@ namespace OpenSim.Framework.Types | |||
46 | 46 | ||
47 | public int redirectGridX = 0; //?? | 47 | public int redirectGridX = 0; //?? |
48 | public int redirectGridY = 0; //?? | 48 | public int redirectGridY = 0; //?? |
49 | public uint regionFlags = 0; //?? | 49 | public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings |
50 | 50 | public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default. | |
51 | public byte simAccess = 0; //?? | ||
52 | public float sunHour = 0; | 51 | public float sunHour = 0; |
53 | 52 | ||
54 | public float terrainRaiseLimit = 0; | 53 | public float terrainRaiseLimit = 0; |
55 | public float terrainLowerLimit = 0; | 54 | public float terrainLowerLimit = 0; |
56 | 55 | ||
57 | public bool useEstateSun = false; | 56 | public bool useFixedSun = false; |
58 | public int pricePerMeter = 1; | 57 | public int pricePerMeter = 1; |
59 | 58 | ||
60 | public ushort regionWaterHeight = 20; | 59 | public ushort regionWaterHeight = 20; |
@@ -74,18 +73,18 @@ namespace OpenSim.Framework.Types | |||
74 | public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000"); | 73 | public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000"); |
75 | 74 | ||
76 | // First quad - each point is bilinearly interpolated at each meter of terrain | 75 | // First quad - each point is bilinearly interpolated at each meter of terrain |
77 | public float terrainStartHeightNW = 10.0f; // NW Corner ( I think ) | 76 | public float terrainStartHeight0 = 10.0f; |
78 | public float terrainStartHeightNE = 10.0f; // NE Corner ( I think ) | 77 | public float terrainStartHeight1 = 10.0f; |
79 | public float terrainStartHeightSW = 10.0f; // SW Corner ( I think ) | 78 | public float terrainStartHeight2 = 10.0f; |
80 | public float terrainStartHeightSE = 10.0f; // SE Corner ( I think ) | 79 | public float terrainStartHeight3 = 10.0f; |
81 | 80 | ||
82 | // Second quad - also bilinearly interpolated. | 81 | // Second quad - also bilinearly interpolated. |
83 | // Terrain texturing is done that: | 82 | // Terrain texturing is done that: |
84 | // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y] | 83 | // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y] |
85 | public float terrainHeightRangeNW = 60.0f; //00 | 84 | public float terrainHeightRange0 = 60.0f; //00 |
86 | public float terrainHeightRangeNE = 60.0f; //01 | 85 | public float terrainHeightRange1 = 60.0f; //01 |
87 | public float terrainHeightRangeSW = 60.0f; //10 | 86 | public float terrainHeightRange2 = 60.0f; //10 |
88 | public float terrainHeightRangeSE = 60.0f; //11 | 87 | public float terrainHeightRange3 = 60.0f; //11 |
89 | 88 | ||
90 | // Terrain Default (Must be in F32 Format!) | 89 | // Terrain Default (Must be in F32 Format!) |
91 | public string terrainFile = "default.r32"; | 90 | public string terrainFile = "default.r32"; |
diff --git a/OpenGridServices.sln b/OpenGridServices.sln index 87f3570..4bcb988 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" |
@@ -27,65 +27,75 @@ EndProject | |||
27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" | 27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" |
28 | EndProject | 28 | EndProject |
29 | Global | 29 | Global |
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(ProjectConfigurationPlatforms) = postSolution | 34 | GlobalSection(ProjectDependencies) = postSolution |
35 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 35 | ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) |
36 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 36 | ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
37 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 37 | ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) |
38 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 38 | ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000}) |
39 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 39 | ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
40 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 40 | ({338FA00B-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) |
41 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 41 | ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000}) |
42 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 42 | ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
43 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 43 | EndGlobalSection |
44 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 44 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
45 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 45 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
46 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 46 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
47 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 47 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
48 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 48 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
49 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 49 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
50 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 50 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
51 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 51 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
52 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 52 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
53 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 53 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
54 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 54 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
55 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 55 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
56 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 56 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
57 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 57 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
58 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 58 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
59 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 59 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
60 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 60 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
61 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 61 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
62 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 62 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
63 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 63 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
64 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 64 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
65 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 65 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
66 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 66 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
67 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 67 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
68 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 68 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
69 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 69 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
70 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 70 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
71 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 71 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
72 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 72 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
73 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 73 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
74 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 74 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
75 | {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 75 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
76 | {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 76 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
77 | {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 77 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
78 | {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 78 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
79 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 79 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
80 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 80 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
81 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 81 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
82 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 82 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
83 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 83 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
84 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 84 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
85 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 85 | {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
86 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 86 | {338FA00B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
87 | EndGlobalSection | 87 | {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
88 | GlobalSection(SolutionProperties) = preSolution | 88 | {338FA00B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
89 | HideSolutionNode = FALSE | 89 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
90 | EndGlobalSection | 90 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
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 | ||
91 | EndGlobal | 101 | EndGlobal |
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj index b461bd1..0e7ff5a 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,8 +6,7 @@ | |||
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> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>ServiceManager</AssemblyName> | 12 | <AssemblyName>ServiceManager</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Exe</OutputType> | 17 | <OutputType>Exe</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>ServiceManager</RootNamespace> | 19 | <RootNamespace>ServiceManager</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,31 +55,30 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.ServiceProcess"> | 65 | <Reference Include="System.ServiceProcess" > |
73 | <HintPath>System.ServiceProcess.dll</HintPath> | 66 | <HintPath>System.ServiceProcess.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System.Xml"> | 69 | <Reference Include="System.Xml" > |
77 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="libsecondlife.dll"> | 73 | <Reference Include="libsecondlife.dll" > |
81 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="OpenSim.GenericConfig.Xml"> | 77 | <Reference Include="OpenSim.GenericConfig.Xml" > |
85 | <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath> | 78 | <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
88 | <Reference Include="OpenSim.Framework.dll"> | 81 | <Reference Include="OpenSim.Framework.dll" > |
89 | <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath> | 82 | <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath> |
90 | <Private>False</Private> | 83 | <Private>False</Private> |
91 | </Reference> | 84 | </Reference> |
@@ -94,7 +87,7 @@ | |||
94 | </ItemGroup> | 87 | </ItemGroup> |
95 | <ItemGroup> | 88 | <ItemGroup> |
96 | <Compile Include="ServiceManager.cs"> | 89 | <Compile Include="ServiceManager.cs"> |
97 | <SubType>Component</SubType> | 90 | <SubType>Code</SubType> |
98 | </Compile> | 91 | </Compile> |
99 | </ItemGroup> | 92 | </ItemGroup> |
100 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 93 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
@@ -104,4 +97,4 @@ | |||
104 | <PostBuildEvent> | 97 | <PostBuildEvent> |
105 | </PostBuildEvent> | 98 | </PostBuildEvent> |
106 | </PropertyGroup> | 99 | </PropertyGroup> |
107 | </Project> \ No newline at end of file | 100 | </Project> |
diff --git a/OpenSim.sln b/OpenSim.sln index 4ad8e63..f82757b 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" |
@@ -37,85 +37,124 @@ EndProject | |||
37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" | 37 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" |
38 | EndProject | 38 | EndProject |
39 | Global | 39 | Global |
40 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 40 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
41 | Debug|Any CPU = Debug|Any CPU | 41 | Debug|Any CPU = Debug|Any CPU |
42 | Release|Any CPU = Release|Any CPU | 42 | Release|Any CPU = Release|Any CPU |
43 | EndGlobalSection | 43 | EndGlobalSection |
44 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 44 | GlobalSection(ProjectDependencies) = postSolution |
45 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 45 | ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
46 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 46 | ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
47 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 47 | ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) |
48 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 48 | ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
49 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 49 | ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
50 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 50 | ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
51 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 51 | ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000}) |
52 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 52 | ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000}) |
53 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 53 | ({438A9556-0000-0000-0000-000000000000}).10 = ({632E1BFD-0000-0000-0000-000000000000}) |
54 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 54 | ({438A9556-0000-0000-0000-000000000000}).11 = ({E88EF749-0000-0000-0000-000000000000}) |
55 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 55 | ({438A9556-0000-0000-0000-000000000000}).12 = ({8E81D43C-0000-0000-0000-000000000000}) |
56 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 56 | ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) |
57 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 57 | ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) |
58 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 58 | ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) |
59 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 59 | ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) |
60 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 60 | ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) |
61 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 61 | ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) |
62 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) |
63 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
64 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
65 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
66 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) |
67 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) |
68 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) |
69 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) |
70 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) |
71 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) |
72 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
73 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) |
74 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) |
75 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
76 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 76 | ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
77 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 77 | ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) |
78 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 78 | ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) |
79 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 79 | ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) |
80 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 80 | ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) |
81 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 81 | ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) |
82 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 82 | EndGlobalSection |
83 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 83 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
84 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 84 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
85 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 85 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
86 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 86 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
87 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 87 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
88 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 88 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
89 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 89 | {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
90 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 90 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
91 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 91 | {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
92 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 92 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
93 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 93 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
94 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 94 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
95 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 95 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
96 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 96 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
97 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 97 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
98 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 98 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
99 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 99 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
100 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 100 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
101 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 101 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
102 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 102 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
103 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 103 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
104 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 104 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
105 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 105 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
106 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 106 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
107 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 107 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
108 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 108 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
109 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 109 | {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
110 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 110 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
111 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 111 | {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
112 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 112 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
113 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 113 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
114 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 114 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
115 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 115 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
116 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 116 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
117 | EndGlobalSection | 117 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
118 | GlobalSection(SolutionProperties) = preSolution | 118 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
119 | HideSolutionNode = FALSE | 119 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
120 | EndGlobalSection | 120 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
121 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
122 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
123 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
124 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
125 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
126 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
127 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
128 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
129 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
130 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
131 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
132 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
133 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
134 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
135 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
136 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
137 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
138 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
139 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
140 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
141 | {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
142 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
143 | {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
144 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
145 | {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
146 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
147 | {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
148 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
149 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
150 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
151 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
152 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
153 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
154 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
155 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
156 | EndGlobalSection | ||
157 | GlobalSection(SolutionProperties) = preSolution | ||
158 | HideSolutionNode = FALSE | ||
159 | EndGlobalSection | ||
121 | EndGlobal | 160 | EndGlobal |
diff --git a/OpenSim/OpenSim.RegionServer/Client/ClientView.cs b/OpenSim/OpenSim.RegionServer/Client/ClientView.cs index 6d7c3f2..f6d672c 100644 --- a/OpenSim/OpenSim.RegionServer/Client/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/Client/ClientView.cs | |||
@@ -144,6 +144,7 @@ namespace OpenSim.RegionServer.Client | |||
144 | 144 | ||
145 | 145 | ||
146 | m_world.parcelManager.sendParcelOverlay(this); | 146 | m_world.parcelManager.sendParcelOverlay(this); |
147 | m_world.estateManager.sendRegionInfoPacket(this); | ||
147 | 148 | ||
148 | ClientThread = new Thread(new ThreadStart(AuthUser)); | 149 | ClientThread = new Thread(new ThreadStart(AuthUser)); |
149 | ClientThread.IsBackground = true; | 150 | ClientThread.IsBackground = true; |
diff --git a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs index 33996d0..7a34334 100644 --- a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs +++ b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs | |||
@@ -24,6 +24,16 @@ namespace OpenSim.RegionServer.Estate | |||
24 | m_world = world; //Estate settings found at world.m_regInfo.estateSettings | 24 | m_world = world; //Estate settings found at world.m_regInfo.estateSettings |
25 | } | 25 | } |
26 | 26 | ||
27 | private bool convertParamStringToBool(byte[] field) | ||
28 | { | ||
29 | string s = Helpers.FieldToUTF8String(field); | ||
30 | if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true") | ||
31 | { | ||
32 | return true; | ||
33 | } | ||
34 | return false; | ||
35 | } | ||
36 | |||
27 | public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, ClientView remote_client) | 37 | public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, ClientView remote_client) |
28 | { | 38 | { |
29 | if (remote_client.AgentID == m_world.m_regInfo.MasterAvatarAssignedUUID) | 39 | if (remote_client.AgentID == m_world.m_regInfo.MasterAvatarAssignedUUID) |
@@ -32,27 +42,168 @@ namespace OpenSim.RegionServer.Estate | |||
32 | { | 42 | { |
33 | case "getinfo": | 43 | case "getinfo": |
34 | Console.WriteLine("GETINFO Requested"); | 44 | Console.WriteLine("GETINFO Requested"); |
35 | RegionInfoPacket regionInfoPacket = new RegionInfoPacket(); | 45 | this.sendRegionInfoPacketToAll(); |
36 | regionInfoPacket.AgentData.AgentID = remote_client.AgentID; | 46 | |
37 | regionInfoPacket.AgentData.SessionID = remote_client.SessionID; | 47 | break; |
38 | regionInfoPacket.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor; | 48 | case "setregioninfo": |
39 | regionInfoPacket.RegionInfo.EstateID = m_world.m_regInfo.estateSettings.estateID; | 49 | if (packet.ParamList.Length != 9) |
40 | regionInfoPacket.RegionInfo.MaxAgents = m_world.m_regInfo.estateSettings.maxAgents; | 50 | { |
41 | regionInfoPacket.RegionInfo.ObjectBonusFactor = m_world.m_regInfo.estateSettings.objectBonusFactor; | 51 | OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length"); |
42 | regionInfoPacket.RegionInfo.ParentEstateID = m_world.m_regInfo.estateSettings.parentEstateID; | 52 | } |
43 | regionInfoPacket.RegionInfo.PricePerMeter = m_world.m_regInfo.estateSettings.pricePerMeter; | 53 | else |
44 | regionInfoPacket.RegionInfo.RedirectGridX = m_world.m_regInfo.estateSettings.redirectGridX; | 54 | { |
45 | regionInfoPacket.RegionInfo.RedirectGridY = m_world.m_regInfo.estateSettings.redirectGridY; | 55 | m_world.m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None; |
46 | regionInfoPacket.RegionInfo.RegionFlags = m_world.m_regInfo.estateSettings.regionFlags; | 56 | |
47 | regionInfoPacket.RegionInfo.SimAccess = m_world.m_regInfo.estateSettings.simAccess; | 57 | if (convertParamStringToBool(packet.ParamList[0].Parameter)) |
48 | regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_world.m_regInfo.RegionName); | 58 | { |
49 | regionInfoPacket.RegionInfo.SunHour = m_world.m_regInfo.estateSettings.sunHour; | 59 | m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform; |
50 | regionInfoPacket.RegionInfo.TerrainLowerLimit = m_world.m_regInfo.estateSettings.terrainLowerLimit; | 60 | } |
51 | regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_world.m_regInfo.estateSettings.terrainRaiseLimit; | 61 | |
52 | regionInfoPacket.RegionInfo.UseEstateSun = m_world.m_regInfo.estateSettings.useEstateSun; | 62 | if (convertParamStringToBool(packet.ParamList[1].Parameter)) |
53 | regionInfoPacket.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight; | 63 | { |
54 | 64 | m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly; | |
55 | remote_client.OutPacket(regionInfoPacket); | 65 | } |
66 | |||
67 | if (convertParamStringToBool(packet.ParamList[2].Parameter)) | ||
68 | { | ||
69 | m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage; | ||
70 | } | ||
71 | |||
72 | if (convertParamStringToBool(packet.ParamList[3].Parameter) == false) | ||
73 | { | ||
74 | m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell; | ||
75 | } | ||
76 | |||
77 | |||
78 | int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter))); | ||
79 | m_world.m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents; | ||
80 | |||
81 | float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); | ||
82 | m_world.m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor; | ||
83 | |||
84 | int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); | ||
85 | m_world.m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel; | ||
86 | |||
87 | |||
88 | if (convertParamStringToBool(packet.ParamList[7].Parameter)) | ||
89 | { | ||
90 | m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject; | ||
91 | } | ||
92 | |||
93 | if (convertParamStringToBool(packet.ParamList[8].Parameter)) | ||
94 | { | ||
95 | m_world.m_regInfo.estateSettings.regionFlags = m_world.m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges; | ||
96 | } | ||
97 | |||
98 | sendRegionInfoPacketToAll(); | ||
99 | |||
100 | } | ||
101 | break; | ||
102 | case "texturebase": | ||
103 | foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList) | ||
104 | { | ||
105 | string s = Helpers.FieldToUTF8String(block.Parameter); | ||
106 | string[] splitField = s.Split(' '); | ||
107 | if (splitField.Length == 2) | ||
108 | { | ||
109 | LLUUID tempUUID = new LLUUID(splitField[1]); | ||
110 | switch (Convert.ToInt16(splitField[0])) | ||
111 | { | ||
112 | case 0: | ||
113 | m_world.m_regInfo.estateSettings.terrainBase0 = tempUUID; | ||
114 | break; | ||
115 | case 1: | ||
116 | m_world.m_regInfo.estateSettings.terrainBase1 = tempUUID; | ||
117 | break; | ||
118 | case 2: | ||
119 | m_world.m_regInfo.estateSettings.terrainBase2 = tempUUID; | ||
120 | break; | ||
121 | case 3: | ||
122 | m_world.m_regInfo.estateSettings.terrainBase3 = tempUUID; | ||
123 | break; | ||
124 | } | ||
125 | } | ||
126 | } | ||
127 | break; | ||
128 | case "texturedetail": | ||
129 | foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList) | ||
130 | { | ||
131 | |||
132 | string s = Helpers.FieldToUTF8String(block.Parameter); | ||
133 | string[] splitField = s.Split(' '); | ||
134 | if (splitField.Length == 2) | ||
135 | { | ||
136 | LLUUID tempUUID = new LLUUID(splitField[1]); | ||
137 | switch (Convert.ToInt16(splitField[0])) | ||
138 | { | ||
139 | case 0: | ||
140 | m_world.m_regInfo.estateSettings.terrainDetail0 = tempUUID; | ||
141 | break; | ||
142 | case 1: | ||
143 | m_world.m_regInfo.estateSettings.terrainDetail1 = tempUUID; | ||
144 | break; | ||
145 | case 2: | ||
146 | m_world.m_regInfo.estateSettings.terrainDetail2 = tempUUID; | ||
147 | break; | ||
148 | case 3: | ||
149 | m_world.m_regInfo.estateSettings.terrainDetail3 = tempUUID; | ||
150 | break; | ||
151 | } | ||
152 | } | ||
153 | } | ||
154 | break; | ||
155 | case "textureheights": | ||
156 | foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList) | ||
157 | { | ||
158 | |||
159 | string s = Helpers.FieldToUTF8String(block.Parameter); | ||
160 | string[] splitField = s.Split(' '); | ||
161 | if (splitField.Length == 3) | ||
162 | { | ||
163 | |||
164 | float tempHeightLow = (float)Convert.ToDecimal(splitField[1]); | ||
165 | float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]); | ||
166 | |||
167 | switch (Convert.ToInt16(splitField[0])) | ||
168 | { | ||
169 | case 0: | ||
170 | m_world.m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow; | ||
171 | m_world.m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh; | ||
172 | break; | ||
173 | case 1: | ||
174 | m_world.m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow; | ||
175 | m_world.m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh; | ||
176 | break; | ||
177 | case 2: | ||
178 | m_world.m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow; | ||
179 | m_world.m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh; | ||
180 | break; | ||
181 | case 3: | ||
182 | m_world.m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow; | ||
183 | m_world.m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh; | ||
184 | break; | ||
185 | } | ||
186 | } | ||
187 | } | ||
188 | break; | ||
189 | case "texturecommit": | ||
190 | sendRegionHandshakeToAll(); | ||
191 | break; | ||
192 | case "setregionterrain": | ||
193 | if (packet.ParamList.Length != 9) | ||
194 | { | ||
195 | OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length"); | ||
196 | } | ||
197 | else | ||
198 | { | ||
199 | m_world.m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter)); | ||
200 | m_world.m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter)); | ||
201 | m_world.m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter)); | ||
202 | m_world.m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter); | ||
203 | m_world.m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); | ||
204 | |||
205 | sendRegionInfoPacketToAll(); | ||
206 | } | ||
56 | break; | 207 | break; |
57 | default: | 208 | default: |
58 | OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString()); | 209 | OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString()); |
@@ -60,5 +211,83 @@ namespace OpenSim.RegionServer.Estate | |||
60 | } | 211 | } |
61 | } | 212 | } |
62 | } | 213 | } |
214 | |||
215 | public void sendRegionInfoPacketToAll() | ||
216 | { | ||
217 | foreach (OpenSim.RegionServer.Simulator.Avatar av in m_world.Avatars.Values) | ||
218 | { | ||
219 | this.sendRegionInfoPacket(av.ControllingClient); | ||
220 | } | ||
221 | } | ||
222 | |||
223 | public void sendRegionHandshakeToAll() | ||
224 | { | ||
225 | foreach (OpenSim.RegionServer.Simulator.Avatar av in m_world.Avatars.Values) | ||
226 | { | ||
227 | this.sendRegionHandshake(av.ControllingClient); | ||
228 | } | ||
229 | } | ||
230 | |||
231 | public void sendRegionInfoPacket(ClientView remote_client) | ||
232 | { | ||
233 | |||
234 | RegionInfoPacket regionInfoPacket = new RegionInfoPacket(); | ||
235 | regionInfoPacket.AgentData.AgentID = remote_client.AgentID; | ||
236 | regionInfoPacket.AgentData.SessionID = remote_client.SessionID; | ||
237 | regionInfoPacket.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor; | ||
238 | regionInfoPacket.RegionInfo.EstateID = m_world.m_regInfo.estateSettings.estateID; | ||
239 | regionInfoPacket.RegionInfo.MaxAgents = m_world.m_regInfo.estateSettings.maxAgents; | ||
240 | regionInfoPacket.RegionInfo.ObjectBonusFactor = m_world.m_regInfo.estateSettings.objectBonusFactor; | ||
241 | regionInfoPacket.RegionInfo.ParentEstateID = m_world.m_regInfo.estateSettings.parentEstateID; | ||
242 | regionInfoPacket.RegionInfo.PricePerMeter = m_world.m_regInfo.estateSettings.pricePerMeter; | ||
243 | regionInfoPacket.RegionInfo.RedirectGridX = m_world.m_regInfo.estateSettings.redirectGridX; | ||
244 | regionInfoPacket.RegionInfo.RedirectGridY = m_world.m_regInfo.estateSettings.redirectGridY; | ||
245 | regionInfoPacket.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags; | ||
246 | regionInfoPacket.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess; | ||
247 | regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_world.m_regInfo.RegionName); | ||
248 | regionInfoPacket.RegionInfo.SunHour = m_world.m_regInfo.estateSettings.sunHour; | ||
249 | regionInfoPacket.RegionInfo.TerrainLowerLimit = m_world.m_regInfo.estateSettings.terrainLowerLimit; | ||
250 | regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_world.m_regInfo.estateSettings.terrainRaiseLimit; | ||
251 | regionInfoPacket.RegionInfo.UseEstateSun = !m_world.m_regInfo.estateSettings.useFixedSun; | ||
252 | regionInfoPacket.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight; | ||
253 | |||
254 | remote_client.OutPacket(regionInfoPacket); | ||
255 | } | ||
256 | |||
257 | public void sendRegionHandshake(ClientView remote_client) | ||
258 | { | ||
259 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; | ||
260 | RegionHandshakePacket handshake = new RegionHandshakePacket(); | ||
261 | |||
262 | handshake.RegionInfo.BillableFactor = m_world.m_regInfo.estateSettings.billableFactor; | ||
263 | handshake.RegionInfo.IsEstateManager = false; | ||
264 | handshake.RegionInfo.TerrainHeightRange00 = m_world.m_regInfo.estateSettings.terrainHeightRange0; | ||
265 | handshake.RegionInfo.TerrainHeightRange01 = m_world.m_regInfo.estateSettings.terrainHeightRange1; | ||
266 | handshake.RegionInfo.TerrainHeightRange10 = m_world.m_regInfo.estateSettings.terrainHeightRange2; | ||
267 | handshake.RegionInfo.TerrainHeightRange11 = m_world.m_regInfo.estateSettings.terrainHeightRange3; | ||
268 | handshake.RegionInfo.TerrainStartHeight00 = m_world.m_regInfo.estateSettings.terrainStartHeight0; | ||
269 | handshake.RegionInfo.TerrainStartHeight01 = m_world.m_regInfo.estateSettings.terrainStartHeight1; | ||
270 | handshake.RegionInfo.TerrainStartHeight10 = m_world.m_regInfo.estateSettings.terrainStartHeight2; | ||
271 | handshake.RegionInfo.TerrainStartHeight11 = m_world.m_regInfo.estateSettings.terrainStartHeight3; | ||
272 | handshake.RegionInfo.SimAccess = (byte)m_world.m_regInfo.estateSettings.simAccess; | ||
273 | handshake.RegionInfo.WaterHeight = m_world.m_regInfo.estateSettings.waterHeight; | ||
274 | |||
275 | |||
276 | handshake.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags; | ||
277 | |||
278 | handshake.RegionInfo.SimName = _enc.GetBytes(m_world.m_regInfo.estateSettings.waterHeight + "\0"); | ||
279 | handshake.RegionInfo.SimOwner = m_world.m_regInfo.MasterAvatarAssignedUUID; | ||
280 | handshake.RegionInfo.TerrainBase0 = m_world.m_regInfo.estateSettings.terrainBase0; | ||
281 | handshake.RegionInfo.TerrainBase1 = m_world.m_regInfo.estateSettings.terrainBase1; | ||
282 | handshake.RegionInfo.TerrainBase2 = m_world.m_regInfo.estateSettings.terrainBase2; | ||
283 | handshake.RegionInfo.TerrainBase3 = m_world.m_regInfo.estateSettings.terrainBase3; | ||
284 | handshake.RegionInfo.TerrainDetail0 = m_world.m_regInfo.estateSettings.terrainDetail0; | ||
285 | handshake.RegionInfo.TerrainDetail1 = m_world.m_regInfo.estateSettings.terrainDetail1; | ||
286 | handshake.RegionInfo.TerrainDetail2 = m_world.m_regInfo.estateSettings.terrainDetail2; | ||
287 | handshake.RegionInfo.TerrainDetail3 = m_world.m_regInfo.estateSettings.terrainDetail3; | ||
288 | handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting? | ||
289 | |||
290 | remote_client.OutPacket(handshake); | ||
291 | } | ||
63 | } | 292 | } |
64 | } | 293 | } |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 4f16f2c..12c0645 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -154,15 +154,15 @@ | |||
154 | <Compile Include="AgentAssetUpload.cs"> | 154 | <Compile Include="AgentAssetUpload.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="RegionServerBase.cs"> | ||
158 | <SubType>Code</SubType> | ||
159 | </Compile> | ||
160 | <Compile Include="RegionInfoBase.cs"> | 157 | <Compile Include="RegionInfoBase.cs"> |
161 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
162 | </Compile> | 159 | </Compile> |
163 | <Compile Include="RegionInfo.cs"> | 160 | <Compile Include="RegionInfo.cs"> |
164 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
165 | </Compile> | 162 | </Compile> |
163 | <Compile Include="RegionServerBase.cs"> | ||
164 | <SubType>Code</SubType> | ||
165 | </Compile> | ||
166 | <Compile Include="Simulator\Avatar.Client.cs"> | 166 | <Compile Include="Simulator\Avatar.Client.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
@@ -172,9 +172,6 @@ | |||
172 | <Compile Include="Simulator\World.PacketHandlers.cs"> | 172 | <Compile Include="Simulator\World.PacketHandlers.cs"> |
173 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
174 | </Compile> | 174 | </Compile> |
175 | <Compile Include="Simulator\Avatar.Update.cs"> | ||
176 | <SubType>Code</SubType> | ||
177 | </Compile> | ||
178 | <Compile Include="Simulator\AvatarAnimations.cs"> | 175 | <Compile Include="Simulator\AvatarAnimations.cs"> |
179 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
180 | </Compile> | 177 | </Compile> |
@@ -190,13 +187,16 @@ | |||
190 | <Compile Include="Simulator\Primitive2.cs"> | 187 | <Compile Include="Simulator\Primitive2.cs"> |
191 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
192 | </Compile> | 189 | </Compile> |
190 | <Compile Include="Simulator\SceneObject.cs"> | ||
191 | <SubType>Code</SubType> | ||
192 | </Compile> | ||
193 | <Compile Include="Simulator\Avatar.cs"> | 193 | <Compile Include="Simulator\Avatar.cs"> |
194 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
195 | </Compile> | 195 | </Compile> |
196 | <Compile Include="Simulator\World.cs"> | 196 | <Compile Include="Simulator\Avatar.Update.cs"> |
197 | <SubType>Code</SubType> | 197 | <SubType>Code</SubType> |
198 | </Compile> | 198 | </Compile> |
199 | <Compile Include="Simulator\SceneObject.cs"> | 199 | <Compile Include="Simulator\World.cs"> |
200 | <SubType>Code</SubType> | 200 | <SubType>Code</SubType> |
201 | </Compile> | 201 | </Compile> |
202 | <Compile Include="Simulator\ParcelManager.cs"> | 202 | <Compile Include="Simulator\ParcelManager.cs"> |
@@ -244,10 +244,10 @@ | |||
244 | <Compile Include="Client\ClientView.PacketHandlers.cs"> | 244 | <Compile Include="Client\ClientView.PacketHandlers.cs"> |
245 | <SubType>Code</SubType> | 245 | <SubType>Code</SubType> |
246 | </Compile> | 246 | </Compile> |
247 | <Compile Include="Client\ClientView.ProcessPackets.cs"> | 247 | <Compile Include="Client\ClientViewBase.cs"> |
248 | <SubType>Code</SubType> | 248 | <SubType>Code</SubType> |
249 | </Compile> | 249 | </Compile> |
250 | <Compile Include="Client\ClientViewBase.cs"> | 250 | <Compile Include="Client\ClientView.ProcessPackets.cs"> |
251 | <SubType>Code</SubType> | 251 | <SubType>Code</SubType> |
252 | </Compile> | 252 | </Compile> |
253 | <Compile Include="Client\ClientView.cs"> | 253 | <Compile Include="Client\ClientView.cs"> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 702c90c..5f33913 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -21,21 +21,21 @@ | |||
21 | <include name="AuthenticateSessionsBase.cs" /> | 21 | <include name="AuthenticateSessionsBase.cs" /> |
22 | <include name="VersionInfo.cs" /> | 22 | <include name="VersionInfo.cs" /> |
23 | <include name="AgentAssetUpload.cs" /> | 23 | <include name="AgentAssetUpload.cs" /> |
24 | <include name="RegionServerBase.cs" /> | ||
25 | <include name="RegionInfoBase.cs" /> | 24 | <include name="RegionInfoBase.cs" /> |
26 | <include name="RegionInfo.cs" /> | 25 | <include name="RegionInfo.cs" /> |
26 | <include name="RegionServerBase.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/World.PacketHandlers.cs" /> | 29 | <include name="Simulator/World.PacketHandlers.cs" /> |
30 | <include name="Simulator/Avatar.Update.cs" /> | ||
31 | <include name="Simulator/AvatarAnimations.cs" /> | 30 | <include name="Simulator/AvatarAnimations.cs" /> |
32 | <include name="Simulator/WorldBase.cs" /> | 31 | <include name="Simulator/WorldBase.cs" /> |
33 | <include name="Simulator/Primitive.cs" /> | 32 | <include name="Simulator/Primitive.cs" /> |
34 | <include name="Simulator/World.Scripting.cs" /> | 33 | <include name="Simulator/World.Scripting.cs" /> |
35 | <include name="Simulator/Primitive2.cs" /> | 34 | <include name="Simulator/Primitive2.cs" /> |
35 | <include name="Simulator/SceneObject.cs" /> | ||
36 | <include name="Simulator/Avatar.cs" /> | 36 | <include name="Simulator/Avatar.cs" /> |
37 | <include name="Simulator/Avatar.Update.cs" /> | ||
37 | <include name="Simulator/World.cs" /> | 38 | <include name="Simulator/World.cs" /> |
38 | <include name="Simulator/SceneObject.cs" /> | ||
39 | <include name="Simulator/ParcelManager.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" /> |
@@ -51,8 +51,8 @@ | |||
51 | <include name="Types/Triangle.cs" /> | 51 | <include name="Types/Triangle.cs" /> |
52 | <include name="Client/ClientView.Grid.cs" /> | 52 | <include name="Client/ClientView.Grid.cs" /> |
53 | <include name="Client/ClientView.PacketHandlers.cs" /> | 53 | <include name="Client/ClientView.PacketHandlers.cs" /> |
54 | <include name="Client/ClientView.ProcessPackets.cs" /> | ||
55 | <include name="Client/ClientViewBase.cs" /> | 54 | <include name="Client/ClientViewBase.cs" /> |
55 | <include name="Client/ClientView.ProcessPackets.cs" /> | ||
56 | <include name="Client/ClientView.cs" /> | 56 | <include name="Client/ClientView.cs" /> |
57 | </sources> | 57 | </sources> |
58 | <references basedir="${project::get-base-directory()}"> | 58 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs index 6f32c85..03da861 100644 --- a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs +++ b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.Update.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.RegionServer.Simulator | |||
54 | //use CreateTerseBlock() | 54 | //use CreateTerseBlock() |
55 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); | 55 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); |
56 | ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); | 56 | ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); |
57 | terse.RegionData.RegionHandle = m_regionHandle; // FIXME | 57 | terse.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle; |
58 | terse.RegionData.TimeDilation = 64096; | 58 | terse.RegionData.TimeDilation = 64096; |
59 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; | 59 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; |
60 | terse.ObjectData[0] = terseBlock; | 60 | terse.ObjectData[0] = terseBlock; |
@@ -78,7 +78,7 @@ namespace OpenSim.RegionServer.Simulator | |||
78 | //It has been a while since last update was sent so lets send one. | 78 | //It has been a while since last update was sent so lets send one. |
79 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); | 79 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); |
80 | ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); | 80 | ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); |
81 | terse.RegionData.RegionHandle = m_regionHandle; // FIXME | 81 | terse.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle; |
82 | terse.RegionData.TimeDilation = 64096; | 82 | terse.RegionData.TimeDilation = 64096; |
83 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; | 83 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; |
84 | terse.ObjectData[0] = terseBlock; | 84 | terse.ObjectData[0] = terseBlock; |
@@ -158,7 +158,7 @@ namespace OpenSim.RegionServer.Simulator | |||
158 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; | 158 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; |
159 | //send a objectupdate packet with information about the clients avatar | 159 | //send a objectupdate packet with information about the clients avatar |
160 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); | 160 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); |
161 | objupdate.RegionData.RegionHandle = m_regionHandle; | 161 | objupdate.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle; |
162 | objupdate.RegionData.TimeDilation = 64096; | 162 | objupdate.RegionData.TimeDilation = 64096; |
163 | objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; | 163 | objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; |
164 | 164 | ||
@@ -182,7 +182,7 @@ namespace OpenSim.RegionServer.Simulator | |||
182 | //send a objectupdate packet with information about the clients avatar | 182 | //send a objectupdate packet with information about the clients avatar |
183 | 183 | ||
184 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); | 184 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); |
185 | objupdate.RegionData.RegionHandle = m_regionHandle; | 185 | objupdate.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle; |
186 | objupdate.RegionData.TimeDilation = 64096; | 186 | objupdate.RegionData.TimeDilation = 64096; |
187 | objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; | 187 | objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1]; |
188 | objupdate.ObjectData[0] = AvatarTemplate; | 188 | objupdate.ObjectData[0] = AvatarTemplate; |
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs index 65a9a63..a64ee9e 100644 --- a/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs +++ b/OpenSim/OpenSim.RegionServer/Simulator/Avatar.cs | |||
@@ -66,24 +66,15 @@ namespace OpenSim.RegionServer.Simulator | |||
66 | 66 | ||
67 | private int positionParcelHoverLocalID = -1; //Local ID of the last parcel they were over | 67 | private int positionParcelHoverLocalID = -1; //Local ID of the last parcel they were over |
68 | private int parcelUpdateSequenceIncrement = 1; | 68 | private int parcelUpdateSequenceIncrement = 1; |
69 | private ulong m_regionHandle; | 69 | |
70 | //private Dictionary<uint, ClientView> m_clientThreads; | ||
71 | private string m_regionName; | ||
72 | private ushort m_regionWaterHeight; | ||
73 | private bool m_regionTerraform; | ||
74 | private bool childAvatar = false; | 70 | private bool childAvatar = false; |
75 | 71 | ||
76 | public Avatar(ClientView TheClient, World world, string regionName, Dictionary<uint, ClientView> clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater) | 72 | public Avatar(ClientView TheClient, World world) |
77 | { | 73 | { |
78 | m_world = world; | 74 | m_world = world; |
79 | // m_clientThreads = clientThreads; | 75 | ControllingClient = TheClient; |
80 | m_regionName = regionName; | ||
81 | m_regionHandle = regionHandle; | ||
82 | m_regionTerraform = regionTerraform; | ||
83 | m_regionWaterHeight = regionWater; | ||
84 | 76 | ||
85 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs - Loading details from grid (DUMMY)"); | 77 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs - Loading details from grid (DUMMY)"); |
86 | ControllingClient = TheClient; | ||
87 | localid = 8880000 + (this.m_world._localNumber++); | 78 | localid = 8880000 + (this.m_world._localNumber++); |
88 | Pos = ControllingClient.startpos; | 79 | Pos = ControllingClient.startpos; |
89 | visualParams = new byte[218]; | 80 | visualParams = new byte[218]; |
@@ -133,7 +124,7 @@ namespace OpenSim.RegionServer.Simulator | |||
133 | this._physActor.Velocity = new PhysicsVector(0, 0, 0); | 124 | this._physActor.Velocity = new PhysicsVector(0, 0, 0); |
134 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); | 125 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock(); |
135 | ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); | 126 | ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket(); |
136 | terse.RegionData.RegionHandle = m_regionHandle; // FIXME | 127 | terse.RegionData.RegionHandle = m_world.m_regInfo.RegionHandle; |
137 | terse.RegionData.TimeDilation = 64096; | 128 | terse.RegionData.TimeDilation = 64096; |
138 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; | 129 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; |
139 | terse.ObjectData[0] = terseBlock; | 130 | terse.ObjectData[0] = terseBlock; |
@@ -251,7 +242,7 @@ namespace OpenSim.RegionServer.Simulator | |||
251 | AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); | 242 | AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); |
252 | mov.AgentData.SessionID = this.ControllingClient.SessionID; | 243 | mov.AgentData.SessionID = this.ControllingClient.SessionID; |
253 | mov.AgentData.AgentID = this.ControllingClient.AgentID; | 244 | mov.AgentData.AgentID = this.ControllingClient.AgentID; |
254 | mov.Data.RegionHandle = this.m_regionHandle; | 245 | mov.Data.RegionHandle = this.m_world.m_regInfo.RegionHandle; |
255 | // TODO - dynamicalise this stuff | 246 | // TODO - dynamicalise this stuff |
256 | mov.Data.Timestamp = 1172750370; | 247 | mov.Data.Timestamp = 1172750370; |
257 | mov.Data.Position = this.ControllingClient.startpos; | 248 | mov.Data.Position = this.ControllingClient.startpos; |
@@ -415,47 +406,7 @@ namespace OpenSim.RegionServer.Simulator | |||
415 | } | 406 | } |
416 | } | 407 | } |
417 | 408 | ||
418 | //really really should be moved somewhere else (RegionInfo.cs ?) | 409 | |
419 | public void SendRegionHandshake(World regionInfo) | ||
420 | { | ||
421 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet"); | ||
422 | System.Text.Encoding _enc = System.Text.Encoding.ASCII; | ||
423 | RegionHandshakePacket handshake = new RegionHandshakePacket(); | ||
424 | |||
425 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); | ||
426 | handshake.RegionInfo.BillableFactor = 0; | ||
427 | handshake.RegionInfo.IsEstateManager = false; | ||
428 | handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeNW; | ||
429 | handshake.RegionInfo.TerrainHeightRange01 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeNE; | ||
430 | handshake.RegionInfo.TerrainHeightRange10 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeSW; | ||
431 | handshake.RegionInfo.TerrainHeightRange11 = regionInfo.m_regInfo.estateSettings.terrainHeightRangeSE; | ||
432 | handshake.RegionInfo.TerrainStartHeight00 = regionInfo.m_regInfo.estateSettings.terrainStartHeightNW; | ||
433 | handshake.RegionInfo.TerrainStartHeight01 = regionInfo.m_regInfo.estateSettings.terrainStartHeightNE; | ||
434 | handshake.RegionInfo.TerrainStartHeight10 = regionInfo.m_regInfo.estateSettings.terrainStartHeightSW; | ||
435 | handshake.RegionInfo.TerrainStartHeight11 = regionInfo.m_regInfo.estateSettings.terrainStartHeightSE; | ||
436 | handshake.RegionInfo.SimAccess = 13; | ||
437 | handshake.RegionInfo.WaterHeight = m_regionWaterHeight; | ||
438 | uint regionFlags = 72458694; | ||
439 | if (this.m_regionTerraform) | ||
440 | { | ||
441 | regionFlags -= 64; | ||
442 | } | ||
443 | handshake.RegionInfo.RegionFlags = regionFlags; | ||
444 | handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); | ||
445 | handshake.RegionInfo.SimOwner = regionInfo.m_regInfo.MasterAvatarAssignedUUID; | ||
446 | handshake.RegionInfo.TerrainBase0 = regionInfo.m_regInfo.estateSettings.terrainBase0; | ||
447 | handshake.RegionInfo.TerrainBase1 = regionInfo.m_regInfo.estateSettings.terrainBase1; | ||
448 | handshake.RegionInfo.TerrainBase2 = regionInfo.m_regInfo.estateSettings.terrainBase2; | ||
449 | handshake.RegionInfo.TerrainBase3 = regionInfo.m_regInfo.estateSettings.terrainBase3; | ||
450 | handshake.RegionInfo.TerrainDetail0 = regionInfo.m_regInfo.estateSettings.terrainDetail0; | ||
451 | handshake.RegionInfo.TerrainDetail1 = regionInfo.m_regInfo.estateSettings.terrainDetail1; | ||
452 | handshake.RegionInfo.TerrainDetail2 = regionInfo.m_regInfo.estateSettings.terrainDetail2; | ||
453 | handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.estateSettings.terrainDetail3; | ||
454 | handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); | ||
455 | |||
456 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet"); | ||
457 | this.ControllingClient.OutPacket(handshake); | ||
458 | } | ||
459 | 410 | ||
460 | public static void LoadAnims() | 411 | public static void LoadAnims() |
461 | { | 412 | { |
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs index 6d432f1..8620e8c 100644 --- a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs +++ b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs | |||
@@ -562,7 +562,6 @@ namespace OpenSim.RegionServer.Simulator | |||
562 | updatePacket.ParcelData.TotalPrims = 0; //unemplemented | 562 | updatePacket.ParcelData.TotalPrims = 0; //unemplemented |
563 | updatePacket.ParcelData.UserLocation = parcelData.userLocation; | 563 | updatePacket.ParcelData.UserLocation = parcelData.userLocation; |
564 | updatePacket.ParcelData.UserLookAt = parcelData.userLookAt; | 564 | updatePacket.ParcelData.UserLookAt = parcelData.userLookAt; |
565 | |||
566 | remote_client.OutPacket((Packet)updatePacket); | 565 | remote_client.OutPacket((Packet)updatePacket); |
567 | } | 566 | } |
568 | 567 | ||
@@ -588,6 +587,15 @@ namespace OpenSim.RegionServer.Simulator | |||
588 | parcelData.snapshotID = packet.ParcelData.SnapshotID; | 587 | parcelData.snapshotID = packet.ParcelData.SnapshotID; |
589 | parcelData.userLocation = packet.ParcelData.UserLocation; | 588 | parcelData.userLocation = packet.ParcelData.UserLocation; |
590 | parcelData.userLookAt = packet.ParcelData.UserLookAt; | 589 | parcelData.userLookAt = packet.ParcelData.UserLookAt; |
590 | |||
591 | foreach (Avatar av in m_world.Avatars.Values) | ||
592 | { | ||
593 | Parcel over = m_world.parcelManager.getParcel((int)Math.Round(av.Pos.X), (int)Math.Round(av.Pos.Y)); | ||
594 | if (over == this) | ||
595 | { | ||
596 | sendParcelProperties(0, false, 0, av.ControllingClient); | ||
597 | } | ||
598 | } | ||
591 | } | 599 | } |
592 | } | 600 | } |
593 | #endregion | 601 | #endregion |
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.cs index dda8ac4..765c74e 100644 --- a/OpenSim/OpenSim.RegionServer/Simulator/World.cs +++ b/OpenSim/OpenSim.RegionServer/Simulator/World.cs | |||
@@ -627,19 +627,18 @@ namespace OpenSim.RegionServer.Simulator | |||
627 | try | 627 | try |
628 | { | 628 | { |
629 | MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); | 629 | MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); |
630 | newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); | 630 | newAvatar = new Avatar(agentClient, this); |
631 | MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world"); | 631 | MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world"); |
632 | MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake "); | 632 | MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake "); |
633 | newAvatar.SendRegionHandshake(this); | 633 | estateManager.sendRegionHandshake(newAvatar.ControllingClient); |
634 | //if (!agentClient.m_child) | ||
635 | //{ | ||
636 | 634 | ||
637 | PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); | 635 | PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); |
638 | lock (this.LockPhysicsEngine) | 636 | lock (this.LockPhysicsEngine) |
639 | { | 637 | { |
640 | newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); | 638 | newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); |
641 | } | 639 | } |
642 | // } | 640 | |
641 | |||
643 | lock (Entities) | 642 | lock (Entities) |
644 | { | 643 | { |
645 | if (!Entities.ContainsKey(agentClient.AgentID)) | 644 | if (!Entities.ContainsKey(agentClient.AgentID)) |
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj index a3f6ec0..069c5c6 100644 --- a/OpenSim/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim/OpenSim.csproj | |||
@@ -130,10 +130,10 @@ | |||
130 | </ProjectReference> | 130 | </ProjectReference> |
131 | </ItemGroup> | 131 | </ItemGroup> |
132 | <ItemGroup> | 132 | <ItemGroup> |
133 | <Compile Include="OpenSimMain.cs"> | 133 | <Compile Include="Application.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="Application.cs"> | 136 | <Compile Include="OpenSimMain.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | </ItemGroup> | 139 | </ItemGroup> |
diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build index 670b77c..4f8ca8a 100644 --- a/OpenSim/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim/OpenSim.exe.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenSim" dynamicprefix="true" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="OpenSimMain.cs" /> | ||
15 | <include name="Application.cs" /> | 14 | <include name="Application.cs" /> |
15 | <include name="OpenSimMain.cs" /> | ||
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |