aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.RegionServer')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs43
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj32
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user2
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build45
4 files changed, 29 insertions, 93 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 89c1f61..dd9adac 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -235,49 +235,6 @@ namespace OpenSim
235 } 235 }
236 } 236 }
237 237
238 /// <summary>
239 ///
240 /// </summary>
241 /// <param name="regionInfo"></param>
242 public void SendRegionHandshake(RegionInfo regionInfo)
243 {
244 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
245 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
246 RegionHandshakePacket handshake = new RegionHandshakePacket();
247
248 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
249 handshake.RegionInfo.BillableFactor = 0;
250 handshake.RegionInfo.IsEstateManager = false;
251 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.TerrainHeightRange00;
252 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.TerrainHeightRange01;
253 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.TerrainHeightRange10;
254 handshake.RegionInfo.TerrainHeightRange11 = regionInfo.TerrainHeightRange11;
255 handshake.RegionInfo.TerrainStartHeight00 = regionInfo.TerrainStartHeight00;
256 handshake.RegionInfo.TerrainStartHeight01 = regionInfo.TerrainStartHeight01;
257 handshake.RegionInfo.TerrainStartHeight10 = regionInfo.TerrainStartHeight10;
258 handshake.RegionInfo.TerrainStartHeight11 = regionInfo.TerrainStartHeight11;
259 handshake.RegionInfo.SimAccess = 13;
260 handshake.RegionInfo.WaterHeight = regionInfo.RegionWaterHeight;
261 uint regionFlags = 72458694;
262 if (regionInfo.RegionTerraform)
263 {
264 regionFlags -= 64;
265 }
266 handshake.RegionInfo.RegionFlags = regionFlags;
267 handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0");
268 handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
269 handshake.RegionInfo.TerrainBase0 = regionInfo.TerrainBase0;
270 handshake.RegionInfo.TerrainBase1 = regionInfo.TerrainBase1;
271 handshake.RegionInfo.TerrainBase2 = regionInfo.TerrainBase2;
272 handshake.RegionInfo.TerrainBase3 = regionInfo.TerrainBase3;
273 handshake.RegionInfo.TerrainDetail0 = regionInfo.TerrainDetail0;
274 handshake.RegionInfo.TerrainDetail1 = regionInfo.TerrainDetail1;
275 handshake.RegionInfo.TerrainDetail2 = regionInfo.TerrainDetail2;
276 handshake.RegionInfo.TerrainDetail3 = regionInfo.TerrainDetail3;
277 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
278
279 OutPacket(handshake);
280 }
281 238
282 /// <summary> 239 /// <summary>
283 /// 240 ///
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 990b5c3..fa91d7d 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,7 +124,10 @@
124 </ProjectReference> 124 </ProjectReference>
125 </ItemGroup> 125 </ItemGroup>
126 <ItemGroup> 126 <ItemGroup>
127 <Compile Include="AgentAssetUpload.cs"> 127 <Compile Include="NetworkServersInfo.cs">
128 <SubType>Code</SubType>
129 </Compile>
130 <Compile Include="UDPServer.cs">
128 <SubType>Code</SubType> 131 <SubType>Code</SubType>
129 </Compile> 132 </Compile>
130 <Compile Include="AuthenticateSessionsLocal.cs"> 133 <Compile Include="AuthenticateSessionsLocal.cs">
@@ -133,10 +136,10 @@
133 <Compile Include="AuthenticateSessionsRemote.cs"> 136 <Compile Include="AuthenticateSessionsRemote.cs">
134 <SubType>Code</SubType> 137 <SubType>Code</SubType>
135 </Compile> 138 </Compile>
136 <Compile Include="ClientView.API.cs"> 139 <Compile Include="OpenSimNetworkHandler.cs">
137 <SubType>Code</SubType> 140 <SubType>Code</SubType>
138 </Compile> 141 </Compile>
139 <Compile Include="ClientView.cs"> 142 <Compile Include="UserConfigUtility.cs">
140 <SubType>Code</SubType> 143 <SubType>Code</SubType>
141 </Compile> 144 </Compile>
142 <Compile Include="ClientView.Grid.cs"> 145 <Compile Include="ClientView.Grid.cs">
@@ -148,40 +151,37 @@
148 <Compile Include="ClientView.ProcessPackets.cs"> 151 <Compile Include="ClientView.ProcessPackets.cs">
149 <SubType>Code</SubType> 152 <SubType>Code</SubType>
150 </Compile> 153 </Compile>
151 <Compile Include="ClientViewBase.cs"> 154 <Compile Include="VersionInfo.cs">
152 <SubType>Code</SubType>
153 </Compile>
154 <Compile Include="CommsManager.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="NetworkServersInfo.cs"> 157 <Compile Include="AgentAssetUpload.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="OpenSimNetworkHandler.cs"> 160 <Compile Include="ClientViewBase.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="PacketServer.cs"> 163 <Compile Include="RegionServerBase.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="RegionServerBase.cs"> 166 <Compile Include="CommsManager.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="UDPServer.cs"> 169 <Compile Include="ClientView.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="UserConfigUtility.cs"> 172 <Compile Include="PacketServer.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="VersionInfo.cs"> 175 <Compile Include="ClientView.API.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="Assets\AssetCache.cs"> 178 <Compile Include="CAPS\AdminWebFront.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="Assets\InventoryCache.cs"> 181 <Compile Include="Assets\InventoryCache.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="CAPS\AdminWebFront.cs"> 184 <Compile Include="Assets\AssetCache.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 </ItemGroup> 187 </ItemGroup>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
index 9bfaf67..082d673 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> 5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index c984f5a..fc33eb9 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,47 +11,26 @@
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" /> 14 <include name="NetworkServersInfo.cs" />
15 <include name="AuthenticateSessionsBase.cs" /> 15 <include name="UDPServer.cs" />
16 <include name="AuthenticateSessionsLocal.cs" /> 16 <include name="AuthenticateSessionsLocal.cs" />
17 <include name="AuthenticateSessionsRemote.cs" /> 17 <include name="AuthenticateSessionsRemote.cs" />
18 <include name="ClientView.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
19 <include name="UserConfigUtility.cs" />
19 <include name="ClientView.Grid.cs" /> 20 <include name="ClientView.Grid.cs" />
20 <include name="ClientView.PacketHandlers.cs" /> 21 <include name="ClientView.PacketHandlers.cs" />
21 <include name="ClientView.ProcessPackets.cs" /> 22 <include name="ClientView.ProcessPackets.cs" />
23 <include name="VersionInfo.cs" />
24 <include name="AgentAssetUpload.cs" />
22 <include name="ClientViewBase.cs" /> 25 <include name="ClientViewBase.cs" />
23 <include name="Grid.cs" />
24 <include name="OpenSimMain.cs" />
25 <include name="OpenSimNetworkHandler.cs" />
26 <include name="PacketServer.cs" />
27 <include name="RegionInfo.cs" />
28 <include name="RegionInfoBase.cs" />
29 <include name="RegionServerBase.cs" /> 26 <include name="RegionServerBase.cs" />
30 <include name="UDPServer.cs" /> 27 <include name="CommsManager.cs" />
31 <include name="VersionInfo.cs" /> 28 <include name="ClientView.cs" />
32 <include name="Assets/AssetCache.cs" /> 29 <include name="PacketServer.cs" />
33 <include name="Assets/InventoryCache.cs" /> 30 <include name="ClientView.API.cs" />
34 <include name="CAPS/AdminWebFront.cs" /> 31 <include name="CAPS/AdminWebFront.cs" />
35 <include name="types/Mesh.cs" /> 32 <include name="Assets/InventoryCache.cs" />
36 <include name="types/Triangle.cs" /> 33 <include name="Assets/AssetCache.cs" />
37 <include name="world/Avatar.Client.cs" />
38 <include name="world/Avatar.cs" />
39 <include name="world/Avatar.Update.cs" />
40 <include name="world/AvatarAnimations.cs" />
41 <include name="world/Entity.cs" />
42 <include name="world/Primitive.cs" />
43 <include name="world/Primitive2.cs" />
44 <include name="world/SceneObject.cs" />
45 <include name="world/World.cs" />
46 <include name="world/World.PacketHandlers.cs" />
47 <include name="world/World.Scripting.cs" />
48 <include name="world/WorldBase.cs" />
49 <include name="world/scripting/IScriptContext.cs" />
50 <include name="world/scripting/IScriptEntity.cs" />
51 <include name="world/scripting/IScriptHandler.cs" />
52 <include name="world/scripting/Script.cs" />
53 <include name="world/scripting/ScriptFactory.cs" />
54 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
55 </sources> 34 </sources>
56 <references basedir="${project::get-base-directory()}"> 35 <references basedir="${project::get-base-directory()}">
57 <lib> 36 <lib>
generated by cgit v1.1 at 2024-11-11 22:17:25 +0000