From df21da6decff40793acb1f7667b7ea111faab7e3 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 13 Feb 2008 16:35:42 +0000
Subject: * Patch from Dr Schofld's (IBM).  In his own words

all TerrainEngine.LoadFromFileX(string filename) methods don't set the dirty bits in heightmap.diff[,] in contrast to the TerrainEngine.LoadFromFileX(string filename, int dimensionX, int dimensionY, int lowerboundX, int lowerboundY) cousins. this has the unpleasant drawback that the Scene.SendTerrainUpdate(bool) will not send layer data to the client.

the attached patch fixes all LoadFromFileX(.) methods.

Thanks!

* Also small build fix for AvatarFactoryModule



---
 OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index b8b6be8..6042a54 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -178,9 +178,11 @@ namespace OpenSim.Region.Environment.Modules
                                
                                 if (m_avatarsAppearance.ContainsKey(clientView.AgentId))
                                 {
+                                    AvatarAppearance avatAppearance = null;
+                                    
                                     lock (m_avatarsAppearance)
                                     {
-                                        AvatarAppearance avatAppearance = m_avatarsAppearance[clientView.AgentId];
+                                        avatAppearance = m_avatarsAppearance[clientView.AgentId];
                                     }
                                     avatAppearance.Wearables[wear.Type].AssetID = assetId;
                                     avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
-- 
cgit v1.1