diff options
Diffstat (limited to 'OpenSim/OpenSim.Region/Scenes')
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/Avatar.cs | 18 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/Scenes/Scene.cs | 11 |
3 files changed, 13 insertions, 20 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs b/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs index 5d70bc1..50d5a14 100644 --- a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs +++ b/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Scenes | |||
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
63 | this.CheckBorderCrossing(); | 63 | this.CheckForBorderCrossing(); |
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Scenes | |||
156 | /// <summary> | 156 | /// <summary> |
157 | /// | 157 | /// |
158 | /// </summary> | 158 | /// </summary> |
159 | protected void CheckBorderCrossing() | 159 | protected void CheckForBorderCrossing() |
160 | { | 160 | { |
161 | LLVector3 pos2 = this.Pos; | 161 | LLVector3 pos2 = this.Pos; |
162 | LLVector3 vel = this.Velocity; | 162 | LLVector3 vel = this.Velocity; |
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.cs b/OpenSim/OpenSim.Region/Scenes/Avatar.cs index d40e213..6b393a8 100644 --- a/OpenSim/OpenSim.Region/Scenes/Avatar.cs +++ b/OpenSim/OpenSim.Region/Scenes/Avatar.cs | |||
@@ -232,24 +232,6 @@ namespace OpenSim.Region.Scenes | |||
232 | /// | 232 | /// |
233 | /// </summary> | 233 | /// </summary> |
234 | /// <param name="pack"></param> | 234 | /// <param name="pack"></param> |
235 | public void HandleAgentUpdate(Packet pack) | ||
236 | { | ||
237 | this.HandleUpdate((AgentUpdatePacket)pack); | ||
238 | } | ||
239 | |||
240 | /// <summary> | ||
241 | /// | ||
242 | /// </summary> | ||
243 | /// <param name="pack"></param> | ||
244 | public void HandleUpdate(AgentUpdatePacket pack) | ||
245 | { | ||
246 | |||
247 | } | ||
248 | |||
249 | /// <summary> | ||
250 | /// | ||
251 | /// </summary> | ||
252 | /// <param name="pack"></param> | ||
253 | public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation) | 235 | public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation) |
254 | { | 236 | { |
255 | 237 | ||
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs index eb942c2..ca9a112 100644 --- a/OpenSim/OpenSim.Region/Scenes/Scene.cs +++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs | |||
@@ -424,6 +424,17 @@ namespace OpenSim.Region.Scenes | |||
424 | { | 424 | { |
425 | this.Terrain.setHeights1D(map); | 425 | this.Terrain.setHeights1D(map); |
426 | } | 426 | } |
427 | |||
428 | //create a texture asset of the terrain | ||
429 | byte[] data =this.Terrain.exportJpegImage("defaultstripe.png"); | ||
430 | this.m_regInfo.estateSettings.terrainImageID= LLUUID.Random(); | ||
431 | AssetBase asset = new AssetBase(); | ||
432 | asset.FullID = this.m_regInfo.estateSettings.terrainImageID; | ||
433 | asset.Data = data; | ||
434 | asset.Name = "terrainImage"; | ||
435 | asset.Type = 0; | ||
436 | this.assetCache.AddAsset(asset); | ||
437 | |||
427 | } | 438 | } |
428 | catch (Exception e) | 439 | catch (Exception e) |
429 | { | 440 | { |