Reverting the texture sending patch and the new libOMV. This makes this

release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366

2 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 878aa4b..8030b59 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 OSDArray();
+            llsd_response.snapshot_resources = new LLSDArray();
 
             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 73e41ee..e1d7ac3 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
 {
-    [OSDMap]
+    [LLSDMap]
     public class LLSDDiscoveryResponse
     {
-        public OSDArray snapshot_resources;
+        public LLSDArray snapshot_resources;
     }
 
-    [OSDMap]
+    [LLSDMap]
     public class LLSDDiscoveryDataURL
     {
         public string snapshot_format;