diff options
| author | Diva Canto | 2010-04-14 19:23:17 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-04-14 19:23:17 -0700 |
| commit | ff50a90a833f49da5f8c3950148f17807c5139e2 (patch) | |
| tree | 8367e6e59752f6d0798f303884fdbe212a7b2b66 /OpenSim/Services | |
| parent | The missing .csproj for the Robust 32 bit launcher (diff) | |
| parent | minor: add some documentation around the asset udp request path and replace s... (diff) | |
| download | opensim-SC_OLD-ff50a90a833f49da5f8c3950148f17807c5139e2.zip opensim-SC_OLD-ff50a90a833f49da5f8c3950148f17807c5139e2.tar.gz opensim-SC_OLD-ff50a90a833f49da5f8c3950148f17807c5139e2.tar.bz2 opensim-SC_OLD-ff50a90a833f49da5f8c3950148f17807c5139e2.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 2 |
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) |