aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-13 18:59:05 -0700
committerJohn Hurliman2010-04-13 18:59:05 -0700
commit6892fc41f71a00327336dec7158f3ce809ce32a4 (patch)
tree70c56d7d4eee22484055a84a980bbfe6679bc445 /OpenSim/Framework
parentReduce number of AvatarAnimations sent with large number of avatars (diff)
downloadopensim-SC_OLD-6892fc41f71a00327336dec7158f3ce809ce32a4.zip
opensim-SC_OLD-6892fc41f71a00327336dec7158f3ce809ce32a4.tar.gz
opensim-SC_OLD-6892fc41f71a00327336dec7158f3ce809ce32a4.tar.bz2
opensim-SC_OLD-6892fc41f71a00327336dec7158f3ce809ce32a4.tar.xz
Applying patch from lkalif to add support for inventory links to the SimianGrid connectors
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/SLUtil.cs33
1 files changed, 33 insertions, 0 deletions
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index f6d6a7c..a489806 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -106,6 +106,39 @@ namespace OpenSim.Framework
106 } 106 }
107 } 107 }
108 108
109 public static string SLInvTypeToContentType(int invType)
110 {
111 switch ((InventoryType)invType)
112 {
113 case InventoryType.Animation:
114 return "application/vnd.ll.animation";
115 case InventoryType.CallingCard:
116 return "application/vnd.ll.callingcard";
117 case InventoryType.Folder:
118 return "application/vnd.ll.folder";
119 case InventoryType.Gesture:
120 return "application/vnd.ll.gesture";
121 case InventoryType.Landmark:
122 return "application/vnd.ll.landmark";
123 case InventoryType.LSL:
124 return "application/vnd.ll.lsltext";
125 case InventoryType.Notecard:
126 return "application/vnd.ll.notecard";
127 case InventoryType.Attachment:
128 case InventoryType.Object:
129 return "application/vnd.ll.primitive";
130 case InventoryType.Sound:
131 return "application/ogg";
132 case InventoryType.Snapshot:
133 case InventoryType.Texture:
134 return "image/x-j2c";
135 case InventoryType.Wearable:
136 return "application/vnd.ll.clothing";
137 default:
138 return "application/octet-stream";
139 }
140 }
141
109 public static sbyte ContentTypeToSLAssetType(string contentType) 142 public static sbyte ContentTypeToSLAssetType(string contentType)
110 { 143 {
111 switch (contentType) 144 switch (contentType)