From f518ca7feb33c0c1641ccb8f3956246b855f9b6c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Nov 2008 06:25:34 +0000
Subject: Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the
 new libOMV.

---
 OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 2 +-
 OpenSim/Region/DataSnapshot/LLSDDiscovery.cs      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/DataSnapshot')

diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 8030b59..878aa4b 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.DataSnapshot
         {
             //Very static for now, flexible enough to add new formats
             LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse();
-            llsd_response.snapshot_resources = new LLSDArray();
+            llsd_response.snapshot_resources = new OSDArray();
 
             LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL();
             llsd_dataurl.snapshot_format = "os-datasnapshot-v1";
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
index e1d7ac3..73e41ee 100644
--- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
+++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
@@ -30,13 +30,13 @@ using OpenSim.Framework.Communications.Capabilities;
 
 namespace OpenSim.Region.DataSnapshot
 {
-    [LLSDMap]
+    [OSDMap]
     public class LLSDDiscoveryResponse
     {
-        public LLSDArray snapshot_resources;
+        public OSDArray snapshot_resources;
     }
 
-    [LLSDMap]
+    [OSDMap]
     public class LLSDDiscoveryDataURL
     {
         public string snapshot_format;
-- 
cgit v1.1