diff options
author | Justin Clark-Casey (justincc) | 2011-08-30 01:58:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-30 01:58:32 +0100 |
commit | be357f8feeb438e3292292d163918a307d69c69a (patch) | |
tree | f1f45b0a5bb58262885065b7a3fa37dde0d3d03e /OpenSim/Services | |
parent | Move GetMeshKey from buried inside Meshmerizer to a public method on Primitiv... (diff) | |
download | opensim-SC_OLD-be357f8feeb438e3292292d163918a307d69c69a.zip opensim-SC_OLD-be357f8feeb438e3292292d163918a307d69c69a.tar.gz opensim-SC_OLD-be357f8feeb438e3292292d163918a307d69c69a.tar.bz2 opensim-SC_OLD-be357f8feeb438e3292292d163918a307d69c69a.tar.xz |
Fix bug in persisting saved appearances for npcs
Assets have to be marked non-local as well as non-temporary to persist. This is now done.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index d40aa4b..2ea513b 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Services.AssetService | |||
83 | 83 | ||
84 | if (assetLoaderEnabled) | 84 | if (assetLoaderEnabled) |
85 | { | 85 | { |
86 | m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); | 86 | m_log.DebugFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); |
87 | 87 | ||
88 | m_AssetLoader.ForEachDefaultXmlAsset( | 88 | m_AssetLoader.ForEachDefaultXmlAsset( |
89 | loaderArgs, | 89 | loaderArgs, |
@@ -100,7 +100,7 @@ namespace OpenSim.Services.AssetService | |||
100 | }); | 100 | }); |
101 | } | 101 | } |
102 | 102 | ||
103 | m_log.Info("[ASSET SERVICE]: Local asset service enabled"); | 103 | m_log.Debug("[ASSET SERVICE]: Local asset service enabled"); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | } | 106 | } |
@@ -180,6 +180,11 @@ namespace OpenSim.Services.AssetService | |||
180 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length); | 180 | // "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length); |
181 | m_Database.StoreAsset(asset); | 181 | m_Database.StoreAsset(asset); |
182 | } | 182 | } |
183 | // else | ||
184 | // { | ||
185 | // m_log.DebugFormat( | ||
186 | // "[ASSET SERVICE]: Not storing asset {0} {1}, bytes {2} as it already exists", asset.Name, asset.FullID, asset.Data.Length); | ||
187 | // } | ||
183 | 188 | ||
184 | return asset.ID; | 189 | return asset.ID; |
185 | } | 190 | } |