From 9f975ad5aacdca94b2c8531bb00ac486c6e5af52 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Wed, 20 Oct 2010 01:23:54 -0400
Subject: * One more goofy thing.  I note that the sculpt texture id is broken
 out of the ExtraParams data in UploadObjectAsset.   At this moment, if you're
 uploading a Sculpt, make sure to break out the Texture ID into the object
 data or it might not get applied appropriately.

---
 .../Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
index 465da29..09b9719 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
@@ -217,9 +217,12 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
                     switch ((ushort)extraParam.Type)
                     {
                         case (ushort)ExtraParamType.Sculpt:
+                            Primitive.SculptData sculpt = new Primitive.SculptData(extraParam.ExtraParamData, 0);
+
                             pbs.SculptEntry = true;
+
                             pbs.SculptTexture = obj.SculptID;
-                            pbs.SculptType = (byte)SculptType.Mesh;
+                            pbs.SculptType = (byte)sculpt.Type;
 
                             break;
                         case (ushort)ExtraParamType.Flexible:
-- 
cgit v1.1


From a7acb650d400a280a7b9edabd304376dff9c81af Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 19 Oct 2010 22:26:07 -0700
Subject: Deleted verbose debug messages that are bringing sims to an halt.
 Increased the user cache expiration period to 33 hours.

---
 .../CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index e7cfda1..155335b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
     public class UserAccountCache
     {
-        private const double CACHE_EXPIRATION_SECONDS = 120.0;
+        private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
 
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             if (account != null)
                 m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS);
 
-            m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
+            //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
         }
 
         public UserAccount Get(UUID userID, out bool inCache)
-- 
cgit v1.1