Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new

libOMV.
This commit is contained in:
Melanie Thielker
2008-11-19 06:25:34 +00:00
parent 3234472d62
commit f518ca7feb
63 changed files with 447 additions and 446 deletions

View File

@@ -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";

View File

@@ -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;