diff options
author | opensim mirror account | 2010-10-19 22:30:05 -0700 |
---|---|---|
committer | opensim mirror account | 2010-10-19 22:30:05 -0700 |
commit | b2478b41c88a07590e7fa337959060414f37f4ea (patch) | |
tree | 498243b897f0705fe130bd6ffb09b8030739909c /OpenSim/Region/CoreModules | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
parent | Deleted verbose debug messages that are bringing sims to an halt. Increased t... (diff) | |
download | opensim-SC_OLD-b2478b41c88a07590e7fa337959060414f37f4ea.zip opensim-SC_OLD-b2478b41c88a07590e7fa337959060414f37f4ea.tar.gz opensim-SC_OLD-b2478b41c88a07590e7fa337959060414f37f4ea.tar.bz2 opensim-SC_OLD-b2478b41c88a07590e7fa337959060414f37f4ea.tar.xz |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | 4 |
2 files changed, 6 insertions, 3 deletions
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 | |||
217 | switch ((ushort)extraParam.Type) | 217 | switch ((ushort)extraParam.Type) |
218 | { | 218 | { |
219 | case (ushort)ExtraParamType.Sculpt: | 219 | case (ushort)ExtraParamType.Sculpt: |
220 | Primitive.SculptData sculpt = new Primitive.SculptData(extraParam.ExtraParamData, 0); | ||
221 | |||
220 | pbs.SculptEntry = true; | 222 | pbs.SculptEntry = true; |
223 | |||
221 | pbs.SculptTexture = obj.SculptID; | 224 | pbs.SculptTexture = obj.SculptID; |
222 | pbs.SculptType = (byte)SculptType.Mesh; | 225 | pbs.SculptType = (byte)sculpt.Type; |
223 | 226 | ||
224 | break; | 227 | break; |
225 | case (ushort)ExtraParamType.Flexible: | 228 | case (ushort)ExtraParamType.Flexible: |
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 | |||
36 | { | 36 | { |
37 | public class UserAccountCache | 37 | public class UserAccountCache |
38 | { | 38 | { |
39 | private const double CACHE_EXPIRATION_SECONDS = 120.0; | 39 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! |
40 | 40 | ||
41 | private static readonly ILog m_log = | 41 | private static readonly ILog m_log = |
42 | LogManager.GetLogger( | 42 | LogManager.GetLogger( |
@@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
57 | if (account != null) | 57 | if (account != null) |
58 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS); | 58 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS); |
59 | 59 | ||
60 | m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); | 60 | //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); |
61 | } | 61 | } |
62 | 62 | ||
63 | public UserAccount Get(UUID userID, out bool inCache) | 63 | public UserAccount Get(UUID userID, out bool inCache) |