aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-14 11:05:28 -0700
committerJohn Hurliman2010-04-14 11:05:28 -0700
commit1e87fc8a26af3eb8029efa61d711935ff2f337b8 (patch)
tree3d948f8bc19df199f944ad66acab21d543053e09 /OpenSim
parentApplying patch from lkalif to add support for inventory links to the SimianGr... (diff)
downloadopensim-SC-1e87fc8a26af3eb8029efa61d711935ff2f337b8.zip
opensim-SC-1e87fc8a26af3eb8029efa61d711935ff2f337b8.tar.gz
opensim-SC-1e87fc8a26af3eb8029efa61d711935ff2f337b8.tar.bz2
opensim-SC-1e87fc8a26af3eb8029efa61d711935ff2f337b8.tar.xz
Applying a patch from lkalif to fix a small bug in the previous patch
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 9005e94..dc68259 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -792,7 +792,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
792 } 792 }
793 793
794 if (extraData.ContainsKey("LinkedItemType")) 794 if (extraData.ContainsKey("LinkedItemType"))
795 invItem.AssetType = extraData["LinkedItemType"].AsInteger(); 795 invItem.AssetType = SLUtil.ContentTypeToSLAssetType(extraData["LinkedItemType"].AsString());
796 } 796 }
797 797
798 if (invItem.BasePermissions == 0) 798 if (invItem.BasePermissions == 0)