diff options
author | John Hurliman | 2010-03-07 16:03:15 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-07 16:03:15 -0800 |
commit | 3ecccbb77dbe48544637ffc2be4259c8890edac5 (patch) | |
tree | dfde8f13865806462b0f90d35f71fb7430340ec6 /OpenSim/Framework | |
parent | Bug fix: store correct position information upon logout. Fixes mantis #4608 (diff) | |
download | opensim-SC_OLD-3ecccbb77dbe48544637ffc2be4259c8890edac5.zip opensim-SC_OLD-3ecccbb77dbe48544637ffc2be4259c8890edac5.tar.gz opensim-SC_OLD-3ecccbb77dbe48544637ffc2be4259c8890edac5.tar.bz2 opensim-SC_OLD-3ecccbb77dbe48544637ffc2be4259c8890edac5.tar.xz |
* Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional)
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/SLUtil.cs | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs index 81d82be..2fc5bdf 100644 --- a/OpenSim/Framework/SLUtil.cs +++ b/OpenSim/Framework/SLUtil.cs | |||
@@ -59,6 +59,20 @@ namespace OpenSim.Framework | |||
59 | return "application/vnd.ll.gesture"; | 59 | return "application/vnd.ll.gesture"; |
60 | case AssetType.Simstate: | 60 | case AssetType.Simstate: |
61 | return "application/x-metaverse-simstate"; | 61 | return "application/x-metaverse-simstate"; |
62 | case AssetType.FavoriteFolder: | ||
63 | return "application/vnd.ll.favoritefolder"; | ||
64 | case AssetType.Link: | ||
65 | return "application/vnd.ll.link"; | ||
66 | case AssetType.LinkFolder: | ||
67 | return "application/vnd.ll.linkfolder"; | ||
68 | case AssetType.CurrentOutfitFolder: | ||
69 | return "application/vnd.ll.currentoutfitfolder"; | ||
70 | case AssetType.OutfitFolder: | ||
71 | return "application/vnd.ll.outfitfolder"; | ||
72 | case AssetType.MyOutfitsFolder: | ||
73 | return "application/vnd.ll.myoutfitsfolder"; | ||
74 | case AssetType.InboxFolder: | ||
75 | return "application/vnd.ll.inboxfolder"; | ||
62 | case AssetType.Unknown: | 76 | case AssetType.Unknown: |
63 | default: | 77 | default: |
64 | return "application/octet-stream"; | 78 | return "application/octet-stream"; |
@@ -123,6 +137,20 @@ namespace OpenSim.Framework | |||
123 | return (sbyte)AssetType.Gesture; | 137 | return (sbyte)AssetType.Gesture; |
124 | case "application/x-metaverse-simstate": | 138 | case "application/x-metaverse-simstate": |
125 | return (sbyte)AssetType.Simstate; | 139 | return (sbyte)AssetType.Simstate; |
140 | case "application/vnd.ll.favoritefolder": | ||
141 | return (sbyte)AssetType.FavoriteFolder; | ||
142 | case "application/vnd.ll.link": | ||
143 | return (sbyte)AssetType.Link; | ||
144 | case "application/vnd.ll.linkfolder": | ||
145 | return (sbyte)AssetType.LinkFolder; | ||
146 | case "application/vnd.ll.currentoutfitfolder": | ||
147 | return (sbyte)AssetType.CurrentOutfitFolder; | ||
148 | case "application/vnd.ll.outfitfolder": | ||
149 | return (sbyte)AssetType.OutfitFolder; | ||
150 | case "application/vnd.ll.myoutfitsfolder": | ||
151 | return (sbyte)AssetType.MyOutfitsFolder; | ||
152 | case "application/vnd.ll.inboxfolder": | ||
153 | return (sbyte)AssetType.InboxFolder; | ||
126 | case "application/octet-stream": | 154 | case "application/octet-stream": |
127 | default: | 155 | default: |
128 | return (sbyte)AssetType.Unknown; | 156 | return (sbyte)AssetType.Unknown; |