aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs24
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs8
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs98
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs16
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs6
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs6
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs4
11 files changed, 87 insertions, 85 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 6691f14..7803d92 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -31,7 +31,7 @@ using System.IO;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Timers; 33using System.Timers;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using Nini.Config; 36using Nini.Config;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
@@ -113,7 +113,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
113 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) 113 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
114 throw new Exception("wrong password"); 114 throw new Exception("wrong password");
115 115
116 LLUUID regionID = new LLUUID((string) requestData["regionID"]); 116 UUID regionID = new UUID((string) requestData["regionID"]);
117 117
118 responseData["accepted"] = "true"; 118 responseData["accepted"] = "true";
119 response.Value = responseData; 119 response.Value = responseData;
@@ -198,7 +198,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
198 throw new Exception("wrong password"); 198 throw new Exception("wrong password");
199 199
200 string file = (string)requestData["filename"]; 200 string file = (string)requestData["filename"];
201 LLUUID regionID = (string) requestData["regionid"]; 201 UUID regionID = (string) requestData["regionid"];
202 m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file); 202 m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file);
203 203
204 responseData["accepted"] = "true"; 204 responseData["accepted"] = "true";
@@ -379,7 +379,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
379 379
380 // extract or generate region ID now 380 // extract or generate region ID now
381 Scene scene = null; 381 Scene scene = null;
382 LLUUID regionID = LLUUID.Zero; 382 UUID regionID = UUID.Zero;
383 if (requestData.ContainsKey("region_id") && 383 if (requestData.ContainsKey("region_id") &&
384 !String.IsNullOrEmpty((string)requestData["region_id"])) 384 !String.IsNullOrEmpty((string)requestData["region_id"]))
385 { 385 {
@@ -391,7 +391,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
391 } 391 }
392 else 392 else
393 { 393 {
394 regionID = LLUUID.Random(); 394 regionID = UUID.Random();
395 m_log.DebugFormat("[RADMIN] CreateRegion: new region UUID {0}", regionID); 395 m_log.DebugFormat("[RADMIN] CreateRegion: new region UUID {0}", regionID);
396 } 396 }
397 397
@@ -517,7 +517,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
517 /// <description>error message if success is false</description></item> 517 /// <description>error message if success is false</description></item>
518 /// <item><term>avatar_uuid</term> 518 /// <item><term>avatar_uuid</term>
519 /// <description>UUID of the newly created avatar 519 /// <description>UUID of the newly created avatar
520 /// account; LLUUID.Zero if failed. 520 /// account; UUID.Zero if failed.
521 /// </description></item> 521 /// </description></item>
522 /// </list> 522 /// </list>
523 /// </remarks> 523 /// </remarks>
@@ -551,9 +551,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
551 if (null != userProfile) 551 if (null != userProfile)
552 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); 552 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
553 553
554 LLUUID userID = m_app.CreateUser(firstname, lastname, passwd, regX, regY); 554 UUID userID = m_app.CreateUser(firstname, lastname, passwd, regX, regY);
555 555
556 if (userID == LLUUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", 556 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
557 firstname, lastname)); 557 firstname, lastname));
558 558
559 responseData["success"] = "true"; 559 responseData["success"] = "true";
@@ -569,7 +569,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
569 m_log.DebugFormat("[RADMIN] CreateUser: failed: {0}", e.ToString()); 569 m_log.DebugFormat("[RADMIN] CreateUser: failed: {0}", e.ToString());
570 570
571 responseData["success"] = "false"; 571 responseData["success"] = "false";
572 responseData["avatar_uuid"] = LLUUID.Zero.ToString(); 572 responseData["avatar_uuid"] = UUID.Zero.ToString();
573 responseData["error"] = e.Message; 573 responseData["error"] = e.Message;
574 574
575 response.Value = responseData; 575 response.Value = responseData;
@@ -742,7 +742,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
742 Scene scene = null; 742 Scene scene = null;
743 if (requestData.Contains("region_uuid")) 743 if (requestData.Contains("region_uuid"))
744 { 744 {
745 LLUUID region_uuid = (string)requestData["region_uuid"]; 745 UUID region_uuid = (string)requestData["region_uuid"];
746 if (!m_app.SceneManager.TryGetScene(region_uuid, out scene)) 746 if (!m_app.SceneManager.TryGetScene(region_uuid, out scene))
747 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); 747 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
748 } 748 }
@@ -802,7 +802,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
802 string filename = (string)requestData["filename"]; 802 string filename = (string)requestData["filename"];
803 if (requestData.Contains("region_uuid")) 803 if (requestData.Contains("region_uuid"))
804 { 804 {
805 LLUUID region_uuid = (string)requestData["region_uuid"]; 805 UUID region_uuid = (string)requestData["region_uuid"];
806 if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) 806 if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
807 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); 807 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
808 m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); 808 m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
@@ -827,7 +827,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
827 switch (xml_version) 827 switch (xml_version)
828 { 828 {
829 case "1": 829 case "1":
830 m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new LLVector3(0, 0, 0)); 830 m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new Vector3(0, 0, 0));
831 break; 831 break;
832 832
833 case "2": 833 case "2":
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
index 24e5ada..972d840 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
35using System.Collections.Specialized; 35using System.Collections.Specialized;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using libsecondlife; 38using OpenMetaverse;
39using System.Xml; 39using System.Xml;
40 40
41namespace OpenSim.ApplicationPlugins.Rest.Inventory 41namespace OpenSim.ApplicationPlugins.Rest.Inventory
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index 1b94741..9d34b4e 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29using Nini.Config; 29using Nini.Config;
30using System; 30using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
@@ -190,12 +190,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
190 190
191 Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); 191 Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
192 192
193 // The only parameter we accept is an LLUUID for 193 // The only parameter we accept is an UUID for
194 // the asset 194 // the asset
195 195
196 if (rdata.Parameters.Length == 1) 196 if (rdata.Parameters.Length == 1)
197 { 197 {
198 LLUUID uuid = new LLUUID(rdata.Parameters[0]); 198 UUID uuid = new UUID(rdata.Parameters[0]);
199 AssetBase asset = Rest.AssetServices.GetAsset(uuid, istexture); 199 AssetBase asset = Rest.AssetServices.GetAsset(uuid, istexture);
200 200
201 if (asset != null) 201 if (asset != null)
@@ -233,7 +233,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
233 { 233 {
234 Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); 234 Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
235 235
236 // The only parameter we accept is an LLUUID for 236 // The only parameter we accept is an UUID for
237 // the asset 237 // the asset
238 238
239 if (rdata.Parameters.Length == 1) 239 if (rdata.Parameters.Length == 1)
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 82e9a13..d352655 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -31,12 +31,12 @@ using System.IO;
31using System.Threading; 31using System.Threading;
32using System.Xml; 32using System.Xml;
33using System.Drawing; 33using System.Drawing;
34using OpenJPEGNet;
35using OpenSim.Framework; 34using OpenSim.Framework;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
39using libsecondlife; 38using OpenMetaverse;
39using OpenMetaverse.Imaging;
40using Nini.Config; 40using Nini.Config;
41 41
42namespace OpenSim.ApplicationPlugins.Rest.Inventory 42namespace OpenSim.ApplicationPlugins.Rest.Inventory
@@ -189,7 +189,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
189 189
190 // We can only get here if we are authorized 190 // We can only get here if we are authorized
191 // 191 //
192 // The requestor may have specified an LLUUID or 192 // The requestor may have specified an UUID or
193 // a conjoined FirstName LastName string. We'll 193 // a conjoined FirstName LastName string. We'll
194 // try both. If we fail with the first, UUID, 194 // try both. If we fail with the first, UUID,
195 // attempt, we try the other. As an example, the 195 // attempt, we try the other. As an example, the
@@ -202,6 +202,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
202 // required to designate a GET for an entire 202 // required to designate a GET for an entire
203 // inventory. 203 // inventory.
204 // 204 //
205
206
205 // Do we have at least a user agent name? 207 // Do we have at least a user agent name?
206 208
207 if (rdata.Parameters.Length < 1) 209 if (rdata.Parameters.Length < 1)
@@ -210,15 +212,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
210 rdata.Fail(Rest.HttpStatusCodeBadRequest, "no user identity specified"); 212 rdata.Fail(Rest.HttpStatusCodeBadRequest, "no user identity specified");
211 } 213 }
212 214
213 // The first parameter MUST be the agent identification, either an LLUUID 215 // The first parameter MUST be the agent identification, either an UUID
214 // or a space-separated First-name Last-Name specification. We check for 216 // or a space-separated First-name Last-Name specification. We check for
215 // an LLUUID first, if anyone names their character using a valid LLUUID 217 // an UUID first, if anyone names their character using a valid UUID
216 // that identifies another existing avatar will cause this a problem... 218 // that identifies another existing avatar will cause this a problem...
217 219
218 try 220 try
219 { 221 {
220 rdata.uuid = new LLUUID(rdata.Parameters[PARM_USERID]); 222 rdata.uuid = new UUID(rdata.Parameters[PARM_USERID]);
221 Rest.Log.DebugFormat("{0} LLUUID supplied", MsgId); 223 Rest.Log.DebugFormat("{0} UUID supplied", MsgId);
222 rdata.userProfile = Rest.UserServices.GetUserProfile(rdata.uuid); 224 rdata.userProfile = Rest.UserServices.GetUserProfile(rdata.uuid);
223 } 225 }
224 catch 226 catch
@@ -490,7 +492,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
490 // may have already set the parent ID explicitly, in which 492 // may have already set the parent ID explicitly, in which
491 // case we don't have to do it here. 493 // case we don't have to do it here.
492 494
493 if (folder.ParentID == LLUUID.Zero || folder.ParentID == context.ID) 495 if (folder.ParentID == UUID.Zero || folder.ParentID == context.ID)
494 { 496 {
495 if (newnode != String.Empty) 497 if (newnode != String.Empty)
496 { 498 {
@@ -550,7 +552,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
550 // If the parentID is zero, then this is going 552 // If the parentID is zero, then this is going
551 // directly into the root identified by the URI. 553 // directly into the root identified by the URI.
552 554
553 if (item.Folder == LLUUID.Zero) 555 if (item.Folder == UUID.Zero)
554 { 556 {
555 item.Folder = context.ID; 557 item.Folder = context.ID;
556 } 558 }
@@ -719,7 +721,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
719 { 721 {
720 if ((rfound = (folder.Name == PRIVATE_ROOT_NAME))) 722 if ((rfound = (folder.Name == PRIVATE_ROOT_NAME)))
721 { 723 {
722 if ((rfound = (folder.ParentID == LLUUID.Zero))) 724 if ((rfound = (folder.ParentID == UUID.Zero)))
723 break; 725 break;
724 } 726 }
725 } 727 }
@@ -746,7 +748,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
746 foreach (InventoryFolderBase folder in entity.Folders) 748 foreach (InventoryFolderBase folder in entity.Folders)
747 { 749 {
748 if (folder.ParentID == uri.ParentID || 750 if (folder.ParentID == uri.ParentID ||
749 folder.ParentID == LLUUID.Zero) 751 folder.ParentID == UUID.Zero)
750 { 752 {
751 folder.ParentID = uri.ParentID; 753 folder.ParentID = uri.ParentID;
752 xml = folder; 754 xml = folder;
@@ -778,9 +780,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
778 // All went well, so we generate a UUID is one is 780 // All went well, so we generate a UUID is one is
779 // needed. 781 // needed.
780 782
781 if (xml.ID == LLUUID.Zero) 783 if (xml.ID == UUID.Zero)
782 { 784 {
783 xml.ID = LLUUID.Random(); 785 xml.ID = UUID.Random();
784 } 786 }
785 787
786 uri.ParentID = TrashCan.ID; 788 uri.ParentID = TrashCan.ID;
@@ -834,9 +836,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
834 836
835 xml = entity.Items[0]; 837 xml = entity.Items[0];
836 838
837 if (xml.ID == LLUUID.Zero) 839 if (xml.ID == UUID.Zero)
838 { 840 {
839 xml.ID = LLUUID.Random(); 841 xml.ID = UUID.Random();
840 } 842 }
841 843
842 // If the folder reference has changed, then this item is 844 // If the folder reference has changed, then this item is
@@ -1336,7 +1338,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1336 { 1338 {
1337 TrashCan = new InventoryFolderBase(); 1339 TrashCan = new InventoryFolderBase();
1338 TrashCan.Name = "tmp"; 1340 TrashCan.Name = "tmp";
1339 TrashCan.ID = LLUUID.Random(); 1341 TrashCan.ID = UUID.Random();
1340 TrashCan.Version = 1; 1342 TrashCan.Version = 1;
1341 TrashCan.Type = (short) AssetType.TrashFolder; 1343 TrashCan.Type = (short) AssetType.TrashFolder;
1342 TrashCan.ParentID = f.ID; 1344 TrashCan.ParentID = f.ID;
@@ -1556,9 +1558,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1556 // Default values 1558 // Default values
1557 1559
1558 result.Name = String.Empty; 1560 result.Name = String.Empty;
1559 result.ID = LLUUID.Zero; 1561 result.ID = UUID.Zero;
1560 result.Owner = ic.UserID; 1562 result.Owner = ic.UserID;
1561 result.ParentID = LLUUID.Zero; // Context 1563 result.ParentID = UUID.Zero; // Context
1562 result.Type = (short) AssetType.Folder; 1564 result.Type = (short) AssetType.Folder;
1563 result.Version = 1; 1565 result.Version = 1;
1564 1566
@@ -1573,13 +1575,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1573 result.Name = ic.xml.Value; 1575 result.Name = ic.xml.Value;
1574 break; 1576 break;
1575 case "uuid" : 1577 case "uuid" :
1576 result.ID = new LLUUID(ic.xml.Value); 1578 result.ID = new UUID(ic.xml.Value);
1577 break; 1579 break;
1578 case "parent" : 1580 case "parent" :
1579 result.ParentID = new LLUUID(ic.xml.Value); 1581 result.ParentID = new UUID(ic.xml.Value);
1580 break; 1582 break;
1581 case "owner" : 1583 case "owner" :
1582 result.Owner = new LLUUID(ic.xml.Value); 1584 result.Owner = new UUID(ic.xml.Value);
1583 break; 1585 break;
1584 case "type" : 1586 case "type" :
1585 result.Type = Int16.Parse(ic.xml.Value); 1587 result.Type = Int16.Parse(ic.xml.Value);
@@ -1604,7 +1606,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1604 // is necessary where a new folder may have been 1606 // is necessary where a new folder may have been
1605 // introduced. 1607 // introduced.
1606 1608
1607 if (result.ParentID == LLUUID.Zero) 1609 if (result.ParentID == UUID.Zero)
1608 { 1610 {
1609 result.ParentID = ic.Parent(); 1611 result.ParentID = ic.Parent();
1610 } 1612 }
@@ -1632,9 +1634,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1632 // This is a new folder, so no existing UUID is available 1634 // This is a new folder, so no existing UUID is available
1633 // or appropriate 1635 // or appropriate
1634 1636
1635 if (result.ID == LLUUID.Zero) 1637 if (result.ID == UUID.Zero)
1636 { 1638 {
1637 result.ID = LLUUID.Random(); 1639 result.ID = UUID.Random();
1638 } 1640 }
1639 1641
1640 // Treat this as a new context. Any other information is 1642 // Treat this as a new context. Any other information is
@@ -1664,12 +1666,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1664 1666
1665 result.Name = String.Empty; 1667 result.Name = String.Empty;
1666 result.Description = String.Empty; 1668 result.Description = String.Empty;
1667 result.ID = LLUUID.Zero; 1669 result.ID = UUID.Zero;
1668 result.Folder = LLUUID.Zero; 1670 result.Folder = UUID.Zero;
1669 result.Owner = ic.UserID; 1671 result.Owner = ic.UserID;
1670 result.Creator = ic.UserID; 1672 result.Creator = ic.UserID;
1671 result.AssetID = LLUUID.Zero; 1673 result.AssetID = UUID.Zero;
1672 result.GroupID = LLUUID.Zero; 1674 result.GroupID = UUID.Zero;
1673 result.GroupOwned = false; 1675 result.GroupOwned = false;
1674 result.InvType = (int) InventoryType.Unknown; 1676 result.InvType = (int) InventoryType.Unknown;
1675 result.AssetType = (int) AssetType.Unknown; 1677 result.AssetType = (int) AssetType.Unknown;
@@ -1689,19 +1691,19 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1689 result.Description = ic.xml.Value; 1691 result.Description = ic.xml.Value;
1690 break; 1692 break;
1691 case "uuid" : 1693 case "uuid" :
1692 result.ID = new LLUUID(ic.xml.Value); 1694 result.ID = new UUID(ic.xml.Value);
1693 break; 1695 break;
1694 case "folder" : 1696 case "folder" :
1695 result.Folder = new LLUUID(ic.xml.Value); 1697 result.Folder = new UUID(ic.xml.Value);
1696 break; 1698 break;
1697 case "owner" : 1699 case "owner" :
1698 result.Owner = new LLUUID(ic.xml.Value); 1700 result.Owner = new UUID(ic.xml.Value);
1699 break; 1701 break;
1700 case "invtype" : 1702 case "invtype" :
1701 result.InvType = Int32.Parse(ic.xml.Value); 1703 result.InvType = Int32.Parse(ic.xml.Value);
1702 break; 1704 break;
1703 case "creator" : 1705 case "creator" :
1704 result.Creator = new LLUUID(ic.xml.Value); 1706 result.Creator = new UUID(ic.xml.Value);
1705 break; 1707 break;
1706 case "assettype" : 1708 case "assettype" :
1707 result.AssetType = Int32.Parse(ic.xml.Value); 1709 result.AssetType = Int32.Parse(ic.xml.Value);
@@ -1710,7 +1712,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1710 result.GroupOwned = Boolean.Parse(ic.xml.Value); 1712 result.GroupOwned = Boolean.Parse(ic.xml.Value);
1711 break; 1713 break;
1712 case "groupid" : 1714 case "groupid" :
1713 result.GroupID = new LLUUID(ic.xml.Value); 1715 result.GroupID = new UUID(ic.xml.Value);
1714 break; 1716 break;
1715 case "flags" : 1717 case "flags" :
1716 result.Flags = UInt32.Parse(ic.xml.Value); 1718 result.Flags = UInt32.Parse(ic.xml.Value);
@@ -1776,7 +1778,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1776 // This is not a persistent attribute 1778 // This is not a persistent attribute
1777 bool inline = true; 1779 bool inline = true;
1778 1780
1779 LLUUID uuid = LLUUID.Zero; 1781 UUID uuid = UUID.Zero;
1780 1782
1781 // Attribute is optional 1783 // Attribute is optional
1782 if (ic.xml.HasAttributes) 1784 if (ic.xml.HasAttributes)
@@ -1804,7 +1806,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1804 break; 1806 break;
1805 1807
1806 case "uuid" : 1808 case "uuid" :
1807 uuid = new LLUUID(ic.xml.Value); 1809 uuid = new UUID(ic.xml.Value);
1808 break; 1810 break;
1809 1811
1810 case "inline" : 1812 case "inline" :
@@ -1834,7 +1836,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1834 { 1836 {
1835 if (ic.Item != null) 1837 if (ic.Item != null)
1836 { 1838 {
1837 ic.Item.AssetID = new LLUUID(ic.xml.ReadElementContentAsString()); 1839 ic.Item.AssetID = new UUID(ic.xml.ReadElementContentAsString());
1838 Rest.Log.DebugFormat("{0} Asset ID supplied: {1}", MsgId, ic.Item.AssetID); 1840 Rest.Log.DebugFormat("{0} Asset ID supplied: {1}", MsgId, ic.Item.AssetID);
1839 } 1841 }
1840 else 1842 else
@@ -1855,9 +1857,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1855 // Generate a UUID of none were given, and generally none should 1857 // Generate a UUID of none were given, and generally none should
1856 // be. Ever. 1858 // be. Ever.
1857 1859
1858 if (uuid == LLUUID.Zero) 1860 if (uuid == UUID.Zero)
1859 { 1861 {
1860 uuid = LLUUID.Random(); 1862 uuid = UUID.Random();
1861 } 1863 }
1862 1864
1863 // Create AssetBase entity to hold the inlined asset 1865 // Create AssetBase entity to hold the inlined asset
@@ -1887,7 +1889,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1887 // If this is in the context of an item, establish 1889 // If this is in the context of an item, establish
1888 // a link with the item in context. 1890 // a link with the item in context.
1889 1891
1890 if (ic.Item != null && ic.Item.AssetID == LLUUID.Zero) 1892 if (ic.Item != null && ic.Item.AssetID == UUID.Zero)
1891 { 1893 {
1892 ic.Item.AssetID = uuid; 1894 ic.Item.AssetID = uuid;
1893 } 1895 }
@@ -1970,7 +1972,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1970 // here. It should always get set from the information stored 1972 // here. It should always get set from the information stored
1971 // when the Asset element was processed. 1973 // when the Asset element was processed.
1972 1974
1973 if (ic.Item.AssetID == LLUUID.Zero) 1975 if (ic.Item.AssetID == UUID.Zero)
1974 { 1976 {
1975 Rest.Log.ErrorFormat("{0} Unable to complete request", MsgId); 1977 Rest.Log.ErrorFormat("{0} Unable to complete request", MsgId);
1976 Rest.Log.InfoFormat("{0} Asset information is missing", MsgId); 1978 Rest.Log.InfoFormat("{0} Asset information is missing", MsgId);
@@ -1979,16 +1981,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1979 1981
1980 // If the item is new, then assign it an ID 1982 // If the item is new, then assign it an ID
1981 1983
1982 if (ic.Item.ID == LLUUID.Zero) 1984 if (ic.Item.ID == UUID.Zero)
1983 { 1985 {
1984 ic.Item.ID = LLUUID.Random(); 1986 ic.Item.ID = UUID.Random();
1985 } 1987 }
1986 1988
1987 // If the context is being implied, obtain the current 1989 // If the context is being implied, obtain the current
1988 // folder item's ID. If it was specified explicitly, make 1990 // folder item's ID. If it was specified explicitly, make
1989 // sure that theparent folder exists. 1991 // sure that theparent folder exists.
1990 1992
1991 if (ic.Item.Folder == LLUUID.Zero) 1993 if (ic.Item.Folder == UUID.Zero)
1992 { 1994 {
1993 ic.Item.Folder = ic.Parent(); 1995 ic.Item.Folder = ic.Parent();
1994 } 1996 }
@@ -2113,8 +2115,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2113 Bitmap temp; 2115 Bitmap temp;
2114 Stream tgadata = new MemoryStream(ic.Asset.Data); 2116 Stream tgadata = new MemoryStream(ic.Asset.Data);
2115 2117
2116 temp = OpenJPEGNet.LoadTGAClass.LoadTGA(tgadata); 2118 temp = LoadTGAClass.LoadTGA(tgadata);
2117 ic.Asset.Data = OpenJPEGNet.OpenJPEG.EncodeFromImage(temp, true); 2119 ic.Asset.Data = OpenJPEG.EncodeFromImage(temp, true);
2118 } 2120 }
2119 2121
2120 ic.reset(); 2122 ic.reset();
@@ -2129,7 +2131,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2129 /// extensions. 2131 /// extensions.
2130 /// </summary> 2132 /// </summary>
2131 2133
2132 internal LLUUID uuid = LLUUID.Zero; 2134 internal UUID uuid = UUID.Zero;
2133 internal bool HaveInventory = false; 2135 internal bool HaveInventory = false;
2134 internal ICollection<InventoryFolderImpl> folders = null; 2136 internal ICollection<InventoryFolderImpl> folders = null;
2135 internal ICollection<InventoryItemBase> items = null; 2137 internal ICollection<InventoryItemBase> items = null;
@@ -2214,7 +2216,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2214 EveryOnePermissions = DefaultEveryOne; 2216 EveryOnePermissions = DefaultEveryOne;
2215 } 2217 }
2216 2218
2217 internal LLUUID Parent() 2219 internal UUID Parent()
2218 { 2220 {
2219 if (stk.Count != 0) 2221 if (stk.Count != 0)
2220 { 2222 {
@@ -2222,7 +2224,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2222 } 2224 }
2223 else 2225 else
2224 { 2226 {
2225 return LLUUID.Zero; 2227 return UUID.Zero;
2226 } 2228 }
2227 } 2229 }
2228 2230
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
index 3ac48c9..aba7357 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
@@ -26,7 +26,7 @@
26 * 26 *
27 */ 27 */
28 28
29using libsecondlife; 29using OpenMetaverse;
30using Nini.Config; 30using Nini.Config;
31using System; 31using System;
32using System.IO; 32using System.IO;
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
index 1cbe38f..54d8478 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29using Nini.Config; 29using Nini.Config;
30using System; 30using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
@@ -174,7 +174,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests
174 float x = Convert.ToSingle(rdata.Parameters[PARM_MOVE_X]); 174 float x = Convert.ToSingle(rdata.Parameters[PARM_MOVE_X]);
175 float y = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Y]); 175 float y = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Y]);
176 float z = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Z]); 176 float z = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Z]);
177 LLVector3 vector = new LLVector3(x,y,z); 177 Vector3 vector = new Vector3(x,y,z);
178 avatar.DoAutoPilot(0,vector,avatar.ControllingClient); 178 avatar.DoAutoPilot(0,vector,avatar.ControllingClient);
179 } 179 }
180 catch (Exception e) 180 catch (Exception e)
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index ce564dd..d812e24 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
36using System.Timers; 36using System.Timers;
37using System.Xml; 37using System.Xml;
38using System.Xml.Serialization; 38using System.Xml.Serialization;
39using libsecondlife; 39using OpenMetaverse;
40using Mono.Addins; 40using Mono.Addins;
41using Nwc.XmlRpc; 41using Nwc.XmlRpc;
42using Nini.Config; 42using Nini.Config;
@@ -109,11 +109,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
109 // be resilient and don't get confused by a terminating '/' 109 // be resilient and don't get confused by a terminating '/'
110 param = param.TrimEnd(new char[]{'/'}); 110 param = param.TrimEnd(new char[]{'/'});
111 string[] comps = param.Split('/'); 111 string[] comps = param.Split('/');
112 LLUUID regionID = (LLUUID)comps[0]; 112 UUID regionID = (UUID)comps[0];
113 113
114 m_log.DebugFormat("{0} GET region UUID {1}", MsgID, regionID.ToString()); 114 m_log.DebugFormat("{0} GET region UUID {1}", MsgID, regionID.ToString());
115 115
116 if (LLUUID.Zero == regionID) throw new Exception("missing region ID"); 116 if (UUID.Zero == regionID) throw new Exception("missing region ID");
117 117
118 Scene scene = null; 118 Scene scene = null;
119 App.SceneManager.TryGetScene(regionID, out scene); 119 App.SceneManager.TryGetScene(regionID, out scene);
@@ -150,7 +150,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
150 return RegionStats(httpResponse, scene); 150 return RegionStats(httpResponse, scene);
151 151
152 case "prims": 152 case "prims":
153 return RegionPrims(httpResponse, scene, LLVector3.Zero, LLVector3.Zero); 153 return RegionPrims(httpResponse, scene, Vector3.Zero, Vector3.Zero);
154 } 154 }
155 } 155 }
156 156
@@ -162,11 +162,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
162 string[] subregion = comps[2].Split(','); 162 string[] subregion = comps[2].Split(',');
163 if (subregion.Length == 6) 163 if (subregion.Length == 6)
164 { 164 {
165 LLVector3 min, max; 165 Vector3 min, max;
166 try 166 try
167 { 167 {
168 min = new LLVector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2])); 168 min = new Vector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2]));
169 max = new LLVector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5])); 169 max = new Vector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5]));
170 } 170 }
171 catch (Exception) 171 catch (Exception)
172 { 172 {
@@ -215,7 +215,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
215 return XmlWriterResult; 215 return XmlWriterResult;
216 } 216 }
217 217
218 protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, LLVector3 min, LLVector3 max) 218 protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
219 { 219 {
220 httpResponse.SendChunked = true; 220 httpResponse.SendChunked = true;
221 httpResponse.ContentType = "text/xml"; 221 httpResponse.ContentType = "text/xml";
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index 6e3d1ff..73a1b9b 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
36using System.Timers; 36using System.Timers;
37using System.Xml; 37using System.Xml;
38using System.Xml.Serialization; 38using System.Xml.Serialization;
39using libsecondlife; 39using OpenMetaverse;
40using Mono.Addins; 40using Mono.Addins;
41using Nwc.XmlRpc; 41using Nwc.XmlRpc;
42using Nini.Config; 42using Nini.Config;
@@ -76,10 +76,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
76 // Parse region ID and other parameters 76 // Parse region ID and other parameters
77 param = param.TrimEnd(new char[]{'/'}); 77 param = param.TrimEnd(new char[]{'/'});
78 string[] comps = param.Split('/'); 78 string[] comps = param.Split('/');
79 LLUUID regionID = (LLUUID)comps[0]; 79 UUID regionID = (UUID)comps[0];
80 80
81 m_log.DebugFormat("{0} POST region UUID {1}", MsgID, regionID.ToString()); 81 m_log.DebugFormat("{0} POST region UUID {1}", MsgID, regionID.ToString());
82 if (LLUUID.Zero == regionID) throw new Exception("missing region ID"); 82 if (UUID.Zero == regionID) throw new Exception("missing region ID");
83 83
84 Scene scene = null; 84 Scene scene = null;
85 App.SceneManager.TryGetScene(regionID, out scene); 85 App.SceneManager.TryGetScene(regionID, out scene);
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 74cf354..d517895 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using libsecondlife; 28using OpenMetaverse;
29using System; 29using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
@@ -58,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
58 region_id = regInfo.RegionID.ToString(); 58 region_id = regInfo.RegionID.ToString();
59 region_x = regInfo.RegionLocX; 59 region_x = regInfo.RegionLocX;
60 region_y = regInfo.RegionLocY; 60 region_y = regInfo.RegionLocY;
61 if (regInfo.EstateSettings.EstateOwner != LLUUID.Zero) 61 if (regInfo.EstateSettings.EstateOwner != UUID.Zero)
62 region_owner_id = regInfo.EstateSettings.EstateOwner.ToString(); 62 region_owner_id = regInfo.EstateSettings.EstateOwner.ToString();
63 else 63 else
64 region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString(); 64 region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString();
@@ -101,4 +101,4 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
101 } 101 }
102 } 102 }
103 } 103 }
104} \ No newline at end of file 104}
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index 1f68d2b..4c24f3f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
36using System.Timers; 36using System.Timers;
37using System.Xml; 37using System.Xml;
38using System.Xml.Serialization; 38using System.Xml.Serialization;
39using libsecondlife; 39using OpenMetaverse;
40using Nwc.XmlRpc; 40using Nwc.XmlRpc;
41using Nini.Config; 41using Nini.Config;
42using OpenSim.Framework; 42using OpenSim.Framework;
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 1f633d5..3fb9662 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -34,7 +34,7 @@ using System.Net;
34using System.Reflection; 34using System.Reflection;
35using System.Timers; 35using System.Timers;
36using System.Xml; 36using System.Xml;
37using libsecondlife; 37using OpenMetaverse;
38using Nwc.XmlRpc; 38using Nwc.XmlRpc;
39using Nini.Config; 39using Nini.Config;
40using OpenSim.Framework; 40using OpenSim.Framework;
@@ -339,7 +339,7 @@ namespace OpenSim.ApplicationPlugins.Rest
339 /// HTTP header is indeed the password on file for the avatar 339 /// HTTP header is indeed the password on file for the avatar
340 /// specified by the UUID 340 /// specified by the UUID
341 /// </summary> 341 /// </summary>
342 protected bool IsVerifiedUser(OSHttpRequest request, LLUUID uuid) 342 protected bool IsVerifiedUser(OSHttpRequest request, UUID uuid)
343 { 343 {
344 // XXX under construction 344 // XXX under construction
345 return false; 345 return false;