From 7720419fc7e74758125dc401eb3258ba5bd9b4f8 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 2 Sep 2010 20:08:39 +0200
Subject: Experimentally comment the sending of unbaked avatars

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 339d0c4..facbc97 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2464,7 +2464,9 @@ namespace OpenSim.Region.Framework.Scenes
             m_controllingClient.SendAvatarDataImmediate(this);
 
             SendInitialFullUpdateToAllClients();
-            SendAppearanceToAllOtherAgents();
+            // Experimentally commenting this. We don't have bakes at this time
+            // and 1.23 will not display an avatar without bakes.
+            //SendAppearanceToAllOtherAgents();
         }
 
         /// <summary>
-- 
cgit v1.1


From 1c8bc9b7b6a62b38d9378ec08853ab2237c7a53a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 2 Sep 2010 20:51:27 +0200
Subject: Remove commented code and the comment, as the change has proven out

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index facbc97..cc9355e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2464,9 +2464,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_controllingClient.SendAvatarDataImmediate(this);
 
             SendInitialFullUpdateToAllClients();
-            // Experimentally commenting this. We don't have bakes at this time
-            // and 1.23 will not display an avatar without bakes.
-            //SendAppearanceToAllOtherAgents();
         }
 
         /// <summary>
-- 
cgit v1.1


From 17a26c3701f7e8de8a4fc223c2069798223b245d Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 3 Sep 2010 03:16:08 +0200
Subject: Fix an issue with rezzing scripted objects.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index d7767bd..ca089a1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts)
             {
-                if (stateSource == 1 && // Prim crossing
+                if (stateSource == 2 && // Prim crossing
                         m_part.ParentGroup.Scene.m_trustBinaries)
                 {
                     lock (m_items)
@@ -1095,4 +1095,4 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1