ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* This is the fabled LibOMV update with all of the libOMV types from JHurliman

Browse Source 
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point.  Regular people should let the dust settle.
* This has been tested to work with most basic functions. However..   make sure you back up 'everything' before using this.  It's that big!  
* Essentially we're back at square 1 in the testing phase..  so lets identify things that broke.
This commit is contained in:
Teravus Ovares
2008-09-06 07:52:41 +00:00
parent cbec2bf22b
commit 7d89e12293
388 changed files with 6811 additions and 7138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@@ -31,7 +31,7 @@ using System.IO;
using System.Net;
using System.Reflection;
using System.Timers;
using libsecondlife;
using OpenMetaverse;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;
@@ -113,7 +113,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
(!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
throw new Exception("wrong password");
LLUUID regionID = new LLUUID((string) requestData["regionID"]);
UUID regionID = new UUID((string) requestData["regionID"]);
responseData["accepted"] = "true";
response.Value = responseData;
@@ -198,7 +198,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
throw new Exception("wrong password");
string file = (string)requestData["filename"];
LLUUID regionID = (string) requestData["regionid"];
UUID regionID = (string) requestData["regionid"];
m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file);
responseData["accepted"] = "true";
@@ -379,7 +379,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
// extract or generate region ID now
Scene scene = null;
LLUUID regionID = LLUUID.Zero;
UUID regionID = UUID.Zero;
if (requestData.ContainsKey("region_id") &&
!String.IsNullOrEmpty((string)requestData["region_id"]))
{
@@ -391,7 +391,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
}
else
{
regionID = LLUUID.Random();
regionID = UUID.Random();
m_log.DebugFormat("[RADMIN] CreateRegion: new region UUID {0}", regionID);
}
@@ -517,7 +517,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
/// <description>error message if success is false</description></item>
/// <item><term>avatar_uuid</term>
/// <description>UUID of the newly created avatar
/// account; LLUUID.Zero if failed.
/// account; UUID.Zero if failed.
/// </description></item>
/// </list>
/// </remarks>
@@ -551,9 +551,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (null != userProfile)
throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
LLUUID userID = m_app.CreateUser(firstname, lastname, passwd, regX, regY);
UUID userID = m_app.CreateUser(firstname, lastname, passwd, regX, regY);
if (userID == LLUUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
firstname, lastname));
responseData["success"] = "true";
@@ -569,7 +569,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
m_log.DebugFormat("[RADMIN] CreateUser: failed: {0}", e.ToString());
responseData["success"] = "false";
responseData["avatar_uuid"] = LLUUID.Zero.ToString();
responseData["avatar_uuid"] = UUID.Zero.ToString();
responseData["error"] = e.Message;
response.Value = responseData;
@@ -742,7 +742,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
Scene scene = null;
if (requestData.Contains("region_uuid"))
{
LLUUID region_uuid = (string)requestData["region_uuid"];
UUID region_uuid = (string)requestData["region_uuid"];
if (!m_app.SceneManager.TryGetScene(region_uuid, out scene))
throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
}
@@ -802,7 +802,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
string filename = (string)requestData["filename"];
if (requestData.Contains("region_uuid"))
{
LLUUID region_uuid = (string)requestData["region_uuid"];
UUID region_uuid = (string)requestData["region_uuid"];
if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
@@ -827,7 +827,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
switch (xml_version)
{
case "1":
m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new LLVector3(0, 0, 0));
m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new Vector3(0, 0, 0));
break;
case "2":

2
OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
View File

@@ -35,7 +35,7 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using libsecondlife;
using OpenMetaverse;
using System.Xml;
namespace OpenSim.ApplicationPlugins.Rest.Inventory

8
OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
View File

@@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using libsecondlife;
using OpenMetaverse;
using Nini.Config;
using System;
using System.Collections.Generic;
@@ -190,12 +190,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
// The only parameter we accept is an LLUUID for
// The only parameter we accept is an UUID for
// the asset
if (rdata.Parameters.Length == 1)
{
LLUUID uuid = new LLUUID(rdata.Parameters[0]);
UUID uuid = new UUID(rdata.Parameters[0]);
AssetBase asset = Rest.AssetServices.GetAsset(uuid, istexture);
if (asset != null)
@@ -233,7 +233,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
// The only parameter we accept is an LLUUID for
// The only parameter we accept is an UUID for
// the asset
if (rdata.Parameters.Length == 1)

98
OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
View File

@@ -31,12 +31,12 @@ using System.IO;
using System.Threading;
using System.Xml;
using System.Drawing;
using OpenJPEGNet;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using libsecondlife;
using OpenMetaverse;
using OpenMetaverse.Imaging;
using Nini.Config;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
@@ -189,7 +189,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// We can only get here if we are authorized
//
// The requestor may have specified an LLUUID or
// The requestor may have specified an UUID or
// a conjoined FirstName LastName string. We'll
// try both. If we fail with the first, UUID,
// attempt, we try the other. As an example, the
@@ -202,6 +202,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// required to designate a GET for an entire
// inventory.
//
// Do we have at least a user agent name?
if (rdata.Parameters.Length < 1)
@@ -210,15 +212,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
rdata.Fail(Rest.HttpStatusCodeBadRequest, "no user identity specified");
}
// The first parameter MUST be the agent identification, either an LLUUID
// The first parameter MUST be the agent identification, either an UUID
// or a space-separated First-name Last-Name specification. We check for
// an LLUUID first, if anyone names their character using a valid LLUUID
// an UUID first, if anyone names their character using a valid UUID
// that identifies another existing avatar will cause this a problem...
try
{
rdata.uuid = new LLUUID(rdata.Parameters[PARM_USERID]);
Rest.Log.DebugFormat("{0} LLUUID supplied", MsgId);
rdata.uuid = new UUID(rdata.Parameters[PARM_USERID]);
Rest.Log.DebugFormat("{0} UUID supplied", MsgId);
rdata.userProfile = Rest.UserServices.GetUserProfile(rdata.uuid);
}
catch
@@ -490,7 +492,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// may have already set the parent ID explicitly, in which
// case we don't have to do it here.
if (folder.ParentID == LLUUID.Zero || folder.ParentID == context.ID)
if (folder.ParentID == UUID.Zero || folder.ParentID == context.ID)
{
if (newnode != String.Empty)
{
@@ -550,7 +552,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// If the parentID is zero, then this is going
// directly into the root identified by the URI.
if (item.Folder == LLUUID.Zero)
if (item.Folder == UUID.Zero)
{
item.Folder = context.ID;
}
@@ -719,7 +721,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
if ((rfound = (folder.Name == PRIVATE_ROOT_NAME)))
{
if ((rfound = (folder.ParentID == LLUUID.Zero)))
if ((rfound = (folder.ParentID == UUID.Zero)))
break;
}
}
@@ -746,7 +748,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
foreach (InventoryFolderBase folder in entity.Folders)
{
if (folder.ParentID == uri.ParentID ||
folder.ParentID == LLUUID.Zero)
folder.ParentID == UUID.Zero)
{
folder.ParentID = uri.ParentID;
xml = folder;
@@ -778,9 +780,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// All went well, so we generate a UUID is one is
// needed.
if (xml.ID == LLUUID.Zero)
if (xml.ID == UUID.Zero)
{
xml.ID = LLUUID.Random();
xml.ID = UUID.Random();
}
uri.ParentID = TrashCan.ID;
@@ -834,9 +836,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
xml = entity.Items[0];
if (xml.ID == LLUUID.Zero)
if (xml.ID == UUID.Zero)
{
xml.ID = LLUUID.Random();
xml.ID = UUID.Random();
}
// If the folder reference has changed, then this item is
@@ -1336,7 +1338,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
TrashCan = new InventoryFolderBase();
TrashCan.Name = "tmp";
TrashCan.ID = LLUUID.Random();
TrashCan.ID = UUID.Random();
TrashCan.Version = 1;
TrashCan.Type = (short) AssetType.TrashFolder;
TrashCan.ParentID = f.ID;
@@ -1556,9 +1558,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// Default values
result.Name = String.Empty;
result.ID = LLUUID.Zero;
result.ID = UUID.Zero;
result.Owner = ic.UserID;
result.ParentID = LLUUID.Zero; // Context
result.ParentID = UUID.Zero; // Context
result.Type = (short) AssetType.Folder;
result.Version = 1;
@@ -1573,13 +1575,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
result.Name = ic.xml.Value;
break;
case "uuid" :
result.ID = new LLUUID(ic.xml.Value);
result.ID = new UUID(ic.xml.Value);
break;
case "parent" :
result.ParentID = new LLUUID(ic.xml.Value);
result.ParentID = new UUID(ic.xml.Value);
break;
case "owner" :
result.Owner = new LLUUID(ic.xml.Value);
result.Owner = new UUID(ic.xml.Value);
break;
case "type" :
result.Type = Int16.Parse(ic.xml.Value);
@@ -1604,7 +1606,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// is necessary where a new folder may have been
// introduced.
if (result.ParentID == LLUUID.Zero)
if (result.ParentID == UUID.Zero)
{
result.ParentID = ic.Parent();
}
@@ -1632,9 +1634,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// This is a new folder, so no existing UUID is available
// or appropriate
if (result.ID == LLUUID.Zero)
if (result.ID == UUID.Zero)
{
result.ID = LLUUID.Random();
result.ID = UUID.Random();
}
// Treat this as a new context. Any other information is
@@ -1664,12 +1666,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
result.Name = String.Empty;
result.Description = String.Empty;
result.ID = LLUUID.Zero;
result.Folder = LLUUID.Zero;
result.ID = UUID.Zero;
result.Folder = UUID.Zero;
result.Owner = ic.UserID;
result.Creator = ic.UserID;
result.AssetID = LLUUID.Zero;
result.GroupID = LLUUID.Zero;
result.AssetID = UUID.Zero;
result.GroupID = UUID.Zero;
result.GroupOwned = false;
result.InvType = (int) InventoryType.Unknown;
result.AssetType = (int) AssetType.Unknown;
@@ -1689,19 +1691,19 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
result.Description = ic.xml.Value;
break;
case "uuid" :
result.ID = new LLUUID(ic.xml.Value);
result.ID = new UUID(ic.xml.Value);
break;
case "folder" :
result.Folder = new LLUUID(ic.xml.Value);
result.Folder = new UUID(ic.xml.Value);
break;
case "owner" :
result.Owner = new LLUUID(ic.xml.Value);
result.Owner = new UUID(ic.xml.Value);
break;
case "invtype" :
result.InvType = Int32.Parse(ic.xml.Value);
break;
case "creator" :
result.Creator = new LLUUID(ic.xml.Value);
result.Creator = new UUID(ic.xml.Value);
break;
case "assettype" :
result.AssetType = Int32.Parse(ic.xml.Value);
@@ -1710,7 +1712,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
result.GroupOwned = Boolean.Parse(ic.xml.Value);
break;
case "groupid" :
result.GroupID = new LLUUID(ic.xml.Value);
result.GroupID = new UUID(ic.xml.Value);
break;
case "flags" :
result.Flags = UInt32.Parse(ic.xml.Value);
@@ -1776,7 +1778,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// This is not a persistent attribute
bool inline = true;
LLUUID uuid = LLUUID.Zero;
UUID uuid = UUID.Zero;
// Attribute is optional
if (ic.xml.HasAttributes)
@@ -1804,7 +1806,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
break;
case "uuid" :
uuid = new LLUUID(ic.xml.Value);
uuid = new UUID(ic.xml.Value);
break;
case "inline" :
@@ -1834,7 +1836,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
if (ic.Item != null)
{
ic.Item.AssetID = new LLUUID(ic.xml.ReadElementContentAsString());
ic.Item.AssetID = new UUID(ic.xml.ReadElementContentAsString());
Rest.Log.DebugFormat("{0} Asset ID supplied: {1}", MsgId, ic.Item.AssetID);
}
else
@@ -1855,9 +1857,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// Generate a UUID of none were given, and generally none should
// be. Ever.
if (uuid == LLUUID.Zero)
if (uuid == UUID.Zero)
{
uuid = LLUUID.Random();
uuid = UUID.Random();
}
// Create AssetBase entity to hold the inlined asset
@@ -1887,7 +1889,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// If this is in the context of an item, establish
// a link with the item in context.
if (ic.Item != null && ic.Item.AssetID == LLUUID.Zero)
if (ic.Item != null && ic.Item.AssetID == UUID.Zero)
{
ic.Item.AssetID = uuid;
}
@@ -1970,7 +1972,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// here. It should always get set from the information stored
// when the Asset element was processed.
if (ic.Item.AssetID == LLUUID.Zero)
if (ic.Item.AssetID == UUID.Zero)
{
Rest.Log.ErrorFormat("{0} Unable to complete request", MsgId);
Rest.Log.InfoFormat("{0} Asset information is missing", MsgId);
@@ -1979,16 +1981,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
// If the item is new, then assign it an ID
if (ic.Item.ID == LLUUID.Zero)
if (ic.Item.ID == UUID.Zero)
{
ic.Item.ID = LLUUID.Random();
ic.Item.ID = UUID.Random();
}
// If the context is being implied, obtain the current
// folder item's ID. If it was specified explicitly, make
// sure that theparent folder exists.
if (ic.Item.Folder == LLUUID.Zero)
if (ic.Item.Folder == UUID.Zero)
{
ic.Item.Folder = ic.Parent();
}
@@ -2113,8 +2115,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Bitmap temp;
Stream tgadata = new MemoryStream(ic.Asset.Data);
temp = OpenJPEGNet.LoadTGAClass.LoadTGA(tgadata);
ic.Asset.Data = OpenJPEGNet.OpenJPEG.EncodeFromImage(temp, true);
temp = LoadTGAClass.LoadTGA(tgadata);
ic.Asset.Data = OpenJPEG.EncodeFromImage(temp, true);
}
ic.reset();
@@ -2129,7 +2131,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
/// extensions.
/// </summary>
internal LLUUID uuid = LLUUID.Zero;
internal UUID uuid = UUID.Zero;
internal bool HaveInventory = false;
internal ICollection<InventoryFolderImpl> folders = null;
internal ICollection<InventoryItemBase> items = null;
@@ -2214,7 +2216,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
EveryOnePermissions = DefaultEveryOne;
}
internal LLUUID Parent()
internal UUID Parent()
{
if (stk.Count != 0)
{
@@ -2222,7 +2224,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
}
else
{
return LLUUID.Zero;
return UUID.Zero;
}
}

2
OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
View File

@@ -26,7 +26,7 @@
*
*/
using libsecondlife;
using OpenMetaverse;
using Nini.Config;
using System;
using System.IO;

4
OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
View File

@@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using libsecondlife;
using OpenMetaverse;
using Nini.Config;
using System;
using System.Collections.Generic;
@@ -174,7 +174,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests
float x = Convert.ToSingle(rdata.Parameters[PARM_MOVE_X]);
float y = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Y]);
float z = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Z]);
LLVector3 vector = new LLVector3(x,y,z);
Vector3 vector = new Vector3(x,y,z);
avatar.DoAutoPilot(0,vector,avatar.ControllingClient);
}
catch (Exception e)

16
OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
View File

@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
using System.Timers;
using System.Xml;
using System.Xml.Serialization;
using libsecondlife;
using OpenMetaverse;
using Mono.Addins;
using Nwc.XmlRpc;
using Nini.Config;
@@ -109,11 +109,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
// be resilient and don't get confused by a terminating '/'
param = param.TrimEnd(new char[]{'/'});
string[] comps = param.Split('/');
LLUUID regionID = (LLUUID)comps[0];
UUID regionID = (UUID)comps[0];
m_log.DebugFormat("{0} GET region UUID {1}", MsgID, regionID.ToString());
if (LLUUID.Zero == regionID) throw new Exception("missing region ID");
if (UUID.Zero == regionID) throw new Exception("missing region ID");
Scene scene = null;
App.SceneManager.TryGetScene(regionID, out scene);
@@ -150,7 +150,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
return RegionStats(httpResponse, scene);
case "prims":
return RegionPrims(httpResponse, scene, LLVector3.Zero, LLVector3.Zero);
return RegionPrims(httpResponse, scene, Vector3.Zero, Vector3.Zero);
}
}
@@ -162,11 +162,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
string[] subregion = comps[2].Split(',');
if (subregion.Length == 6)
{
LLVector3 min, max;
Vector3 min, max;
try
{
min = new LLVector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2]));
max = new LLVector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5]));
min = new Vector3((float)Double.Parse(subregion[0]), (float)Double.Parse(subregion[1]), (float)Double.Parse(subregion[2]));
max = new Vector3((float)Double.Parse(subregion[3]), (float)Double.Parse(subregion[4]), (float)Double.Parse(subregion[5]));
}
catch (Exception)
{
@@ -215,7 +215,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
return XmlWriterResult;
}
protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, LLVector3 min, LLVector3 max)
protected string RegionPrims(OSHttpResponse httpResponse, Scene scene, Vector3 min, Vector3 max)
{
httpResponse.SendChunked = true;
httpResponse.ContentType = "text/xml";

6
OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
View File

@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
using System.Timers;
using System.Xml;
using System.Xml.Serialization;
using libsecondlife;
using OpenMetaverse;
using Mono.Addins;
using Nwc.XmlRpc;
using Nini.Config;
@@ -76,10 +76,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
// Parse region ID and other parameters
param = param.TrimEnd(new char[]{'/'});
string[] comps = param.Split('/');
LLUUID regionID = (LLUUID)comps[0];
UUID regionID = (UUID)comps[0];
m_log.DebugFormat("{0} POST region UUID {1}", MsgID, regionID.ToString());
if (LLUUID.Zero == regionID) throw new Exception("missing region ID");
if (UUID.Zero == regionID) throw new Exception("missing region ID");
Scene scene = null;
App.SceneManager.TryGetScene(regionID, out scene);

6
OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
View File

@@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using libsecondlife;
using OpenMetaverse;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -58,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
region_id = regInfo.RegionID.ToString();
region_x = regInfo.RegionLocX;
region_y = regInfo.RegionLocY;
if (regInfo.EstateSettings.EstateOwner != LLUUID.Zero)
if (regInfo.EstateSettings.EstateOwner != UUID.Zero)
region_owner_id = regInfo.EstateSettings.EstateOwner.ToString();
else
region_owner_id = regInfo.MasterAvatarAssignedUUID.ToString();
@@ -101,4 +101,4 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
}
}
}
}
}

2
OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
View File

@@ -36,7 +36,7 @@ using System.Text.RegularExpressions;
using System.Timers;
using System.Xml;
using System.Xml.Serialization;
using libsecondlife;
using OpenMetaverse;
using Nwc.XmlRpc;
using Nini.Config;
using OpenSim.Framework;

4
OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
View File

@@ -34,7 +34,7 @@ using System.Net;
using System.Reflection;
using System.Timers;
using System.Xml;
using libsecondlife;
using OpenMetaverse;
using Nwc.XmlRpc;
using Nini.Config;
using OpenSim.Framework;
@@ -339,7 +339,7 @@ namespace OpenSim.ApplicationPlugins.Rest
/// HTTP header is indeed the password on file for the avatar
/// specified by the UUID
/// </summary>
protected bool IsVerifiedUser(OSHttpRequest request, LLUUID uuid)
protected bool IsVerifiedUser(OSHttpRequest request, UUID uuid)
{
// XXX under construction
return false;