diff options
Diffstat (limited to '')
-rw-r--r-- | Common/OpenSim.Framework/LLSDHelpers.cs | 36 | ||||
-rw-r--r-- | Common/OpenSim.Servers/BaseHttpServer.cs | 2 |
2 files changed, 31 insertions, 7 deletions
diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/Common/OpenSim.Framework/LLSDHelpers.cs index 5b73483..3b044a3 100644 --- a/Common/OpenSim.Framework/LLSDHelpers.cs +++ b/Common/OpenSim.Framework/LLSDHelpers.cs | |||
@@ -100,6 +100,31 @@ namespace OpenSim.Framework | |||
100 | } | 100 | } |
101 | 101 | ||
102 | [LLSDType("MAP")] | 102 | [LLSDType("MAP")] |
103 | public class LLSDMapLayerResponse | ||
104 | { | ||
105 | public LLSDMapRequest AgentData = new LLSDMapRequest(); | ||
106 | public LLSDArray LayerData = new LLSDArray(); | ||
107 | |||
108 | public LLSDMapLayerResponse() | ||
109 | { | ||
110 | |||
111 | } | ||
112 | } | ||
113 | |||
114 | [LLSDType("MAP")] | ||
115 | public class LLSDCapsDetails | ||
116 | { | ||
117 | public string MapLayer = ""; | ||
118 | public string NewFileAgentInventory = ""; | ||
119 | //public string EventQueueGet = ""; | ||
120 | |||
121 | public LLSDCapsDetails() | ||
122 | { | ||
123 | |||
124 | } | ||
125 | } | ||
126 | |||
127 | [LLSDType("MAP")] | ||
103 | public class LLSDMapLayer | 128 | public class LLSDMapLayer |
104 | { | 129 | { |
105 | public int Left = 0; | 130 | public int Left = 0; |
@@ -108,10 +133,9 @@ namespace OpenSim.Framework | |||
108 | public int Bottom = 0; | 133 | public int Bottom = 0; |
109 | public LLUUID ImageID = LLUUID.Zero; | 134 | public LLUUID ImageID = LLUUID.Zero; |
110 | 135 | ||
111 | public LLSDArray TestArray = new LLSDArray(); | ||
112 | public LLSDMapLayer() | 136 | public LLSDMapLayer() |
113 | { | 137 | { |
114 | 138 | ||
115 | } | 139 | } |
116 | } | 140 | } |
117 | 141 | ||
@@ -137,6 +161,7 @@ namespace OpenSim.Framework | |||
137 | } | 161 | } |
138 | } | 162 | } |
139 | 163 | ||
164 | |||
140 | [LLSDType("MAP")] | 165 | [LLSDType("MAP")] |
141 | public class LLSDTest | 166 | public class LLSDTest |
142 | { | 167 | { |
@@ -153,12 +178,11 @@ namespace OpenSim.Framework | |||
153 | [AttributeUsage(AttributeTargets.Class)] | 178 | [AttributeUsage(AttributeTargets.Class)] |
154 | public class LLSDType : Attribute | 179 | public class LLSDType : Attribute |
155 | { | 180 | { |
156 | private string myHandler; | 181 | private string myType; |
157 | |||
158 | 182 | ||
159 | public LLSDType(string type) | 183 | public LLSDType(string type) |
160 | { | 184 | { |
161 | myHandler = type; | 185 | myType = type; |
162 | 186 | ||
163 | } | 187 | } |
164 | 188 | ||
@@ -166,7 +190,7 @@ namespace OpenSim.Framework | |||
166 | { | 190 | { |
167 | get | 191 | get |
168 | { | 192 | { |
169 | return myHandler; | 193 | return myType; |
170 | } | 194 | } |
171 | } | 195 | } |
172 | } | 196 | } |
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs index 86339c1..e55e33c 100644 --- a/Common/OpenSim.Servers/BaseHttpServer.cs +++ b/Common/OpenSim.Servers/BaseHttpServer.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Servers | |||
75 | 75 | ||
76 | public bool AddRestHandler(string method, string path, RestMethod handler) | 76 | public bool AddRestHandler(string method, string path, RestMethod handler) |
77 | { | 77 | { |
78 | Console.WriteLine("adding new REST handler for path " + path); | 78 | //Console.WriteLine("adding new REST handler for path " + path); |
79 | string methodKey = String.Format("{0}: {1}", method, path); | 79 | string methodKey = String.Format("{0}: {1}", method, path); |
80 | 80 | ||
81 | if (!this.m_restHandlers.ContainsKey(methodKey)) | 81 | if (!this.m_restHandlers.ContainsKey(methodKey)) |