diff options
author | Melanie Thielker | 2010-07-02 03:11:18 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-07-02 03:11:18 +0200 |
commit | 120c9a4ebb3ef2fefca12a49043ab9760535e3cd (patch) | |
tree | 6e37ce225a4357e0f57a22da684e91132efbdd97 | |
parent | Fix a dumb little sign error that makes a LSL wiki example fail (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.zip opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.gz opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.bz2 opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs index 75efb79..8aa87fd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
190 | end = Utils.Clamp(end, 1, texture.Data.Length); | 190 | end = Utils.Clamp(end, 1, texture.Data.Length); |
191 | start = Utils.Clamp(start, 0, end - 1); | 191 | start = Utils.Clamp(start, 0, end - 1); |
192 | 192 | ||
193 | m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID); | 193 | //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID); |
194 | 194 | ||
195 | if (end - start < texture.Data.Length) | 195 | if (end - start < texture.Data.Length) |
196 | response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent; | 196 | response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent; |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index bbaf923..a6ab5e9 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -840,8 +840,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
840 | item.Name, startParam, postOnRez, | 840 | item.Name, startParam, postOnRez, |
841 | stateSource, m_MaxScriptQueue); | 841 | stateSource, m_MaxScriptQueue); |
842 | 842 | ||
843 | m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}", | 843 | m_log.DebugFormat( |
844 | part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString()); | 844 | "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", |
845 | part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, | ||
846 | part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName); | ||
845 | 847 | ||
846 | if (presence != null) | 848 | if (presence != null) |
847 | { | 849 | { |
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 94acd6c..e63dd50 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
@@ -256,11 +256,10 @@ namespace OpenSim.Services.Connectors | |||
256 | 256 | ||
257 | public string Store(AssetBase asset) | 257 | public string Store(AssetBase asset) |
258 | { | 258 | { |
259 | if (m_Cache != null) | ||
260 | m_Cache.Cache(asset); | ||
259 | if (asset.Temporary || asset.Local) | 261 | if (asset.Temporary || asset.Local) |
260 | { | 262 | { |
261 | if (m_Cache != null) | ||
262 | m_Cache.Cache(asset); | ||
263 | |||
264 | return asset.ID; | 263 | return asset.ID; |
265 | } | 264 | } |
266 | 265 | ||