aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-05-16 00:23:32 +0000
committerdiva2009-05-16 00:23:32 +0000
commitd8931def060ec41fd64ce7b6ab569e14a8f9005b (patch)
tree77a43133aa1af6b9fc4ce312842ae3c3d5564021
parentBug fix on POST asset so that the new asset service connector can talk to the... (diff)
downloadopensim-SC_OLD-d8931def060ec41fd64ce7b6ab569e14a8f9005b.zip
opensim-SC_OLD-d8931def060ec41fd64ce7b6ab569e14a8f9005b.tar.gz
opensim-SC_OLD-d8931def060ec41fd64ce7b6ab569e14a8f9005b.tar.bz2
opensim-SC_OLD-d8931def060ec41fd64ce7b6ab569e14a8f9005b.tar.xz
Another minor bug fix for making notecard/script savings work with old asset servers.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs5
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0694576..965b12a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -193,9 +193,9 @@ namespace OpenSim.Region.Framework.Scenes
193 193
194 AssetBase asset = 194 AssetBase asset =
195 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data); 195 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
196 item.AssetID = asset.FullID;
196 AssetService.Store(asset); 197 AssetService.Store(asset);
197 198
198 item.AssetID = asset.FullID;
199 userInfo.UpdateItem(item); 199 userInfo.UpdateItem(item);
200 200
201 // remoteClient.SendInventoryItemCreateUpdate(item); 201 // remoteClient.SendInventoryItemCreateUpdate(item);
diff --git a/OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs
index efd5eea..cebd471 100644
--- a/OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Servers/Connectors/Asset/AssetServiceConnector.cs
@@ -195,7 +195,10 @@ namespace OpenSim.Servers.Connectors
195 195
196 if (newID != String.Empty) 196 if (newID != String.Empty)
197 { 197 {
198 asset.ID = newID; 198 // Placing this here, so that this work with old asset servers that don't send any reply back
199 // SynchronousRestObjectRequester returns somethins that is not an empty string
200 if (!"00000000-0000-0000-0000-000000000000".Equals(newID))
201 asset.ID = newID;
199 202
200 if (m_Cache != null) 203 if (m_Cache != null)
201 m_Cache.Cache(asset); 204 m_Cache.Cache(asset);