From e8c9edae87f07a4b40f79e0cf5a804c13fe772f5 Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Wed, 3 Jun 2009 20:56:39 +0000
Subject: [PATCH] * Removing asset parameter from CB region_info structure *
 Adding CB delete_asset message (LLIDL for now)

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2844 52acb1d6-8a22-11de-b505-999d5b087335
---
 OpenMetaverse/Messages/CableBeachMessages.cs |  4 ----
 data/cablebeach_message_template.msg         | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/OpenMetaverse/Messages/CableBeachMessages.cs b/OpenMetaverse/Messages/CableBeachMessages.cs
index 8134fa90..7d9a0f78 100644
--- a/OpenMetaverse/Messages/CableBeachMessages.cs
+++ b/OpenMetaverse/Messages/CableBeachMessages.cs
@@ -35,7 +35,6 @@ namespace OpenMetaverse.Messages.CableBeach
     /// <summary>
     /// Holds information about a grid region
     /// </summary>
-    // TODO: Make this a class
     public struct RegionInfo
     {
         public string Name;
@@ -44,7 +43,6 @@ namespace OpenMetaverse.Messages.CableBeach
         public bool Online;
         public IPAddress IP;
         public int Port;
-        public Uri Address;
         public UUID MapTextureID;
         public Uri Owner;
         public RegionFlags Flags;
@@ -97,7 +95,6 @@ namespace OpenMetaverse.Messages.CableBeach
             map["online"] = OSD.FromBoolean(Online);
             map["ip"] = MessageUtils.FromIP(IP);
             map["port"] = OSD.FromInteger(Port);
-            map["address"] = OSD.FromUri(Address);
             map["map_texture_id"] = OSD.FromUUID(MapTextureID);
             map["owner"] = OSD.FromUri(Owner);
             map["region_flags"] = OSD.FromInteger((int)Flags);
@@ -117,7 +114,6 @@ namespace OpenMetaverse.Messages.CableBeach
             Online = map["online"].AsBoolean();
             IP = MessageUtils.ToIP(map["ip"]);
             Port = map["port"].AsInteger();
-            Address = map["address"].AsUri();
             MapTextureID = map["map_texture_id"].AsUUID();
             Owner = map["owner"].AsUri();
             Flags = (RegionFlags)map["region_flags"].AsInteger();
diff --git a/data/cablebeach_message_template.msg b/data/cablebeach_message_template.msg
index 6039865a..2fbecb71 100644
--- a/data/cablebeach_message_template.msg
+++ b/data/cablebeach_message_template.msg
@@ -10,7 +10,6 @@
 	online: boolean,
 	ip: binary,
 	port: integer,
-	address: uri,
 	map_texture_id: uuid,
 	owner: uri,
 	region_flags: integer,
@@ -378,6 +377,19 @@
     id: uuid
 }
 
+%%delete_asset
+
+->
+{
+    id: uuid
+}
+
+<-
+{
+    success: boolean,
+    message: string
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Inventory
 ////////////////////////////////////////////////////////////////////////////////