ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +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

20
OpenSim/Grid/UserServer/Main.cs
View File

@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using libsecondlife;
using OpenMetaverse;
using log4net;
using log4net.Config;
using OpenSim.Framework;
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.UserServer
public MessageServersConnector m_messagesService;
protected IInterServiceInventoryServices m_interServiceInventoryService;
private LLUUID m_lastCreatedUser = LLUUID.Random();
private UUID m_lastCreatedUser = UUID.Random();
public static void Main(string[] args)
{
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
{
base.Startup();
Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.Xml")));
m_stats = StatsManager.StartCollectingUserStats();
@@ -183,7 +183,7 @@ namespace OpenSim.Grid.UserServer
tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
LLUUID userID = new LLUUID();
UUID userID = new UUID();
try
{
@@ -209,7 +209,7 @@ namespace OpenSim.Grid.UserServer
{
m_log.ErrorFormat(
"[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
Cfg.InventoryUrl + "CreateInventory/", userID.UUID);
Cfg.InventoryUrl + "CreateInventory/", userID);
}
catch (Exception e)
{
@@ -240,8 +240,8 @@ namespace OpenSim.Grid.UserServer
case "test-inventory":
// RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
// requester.ReturnResponseVal = TestResponse;
// requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(
// requester.BeginPostObject<UUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
SynchronousRestObjectPoster.BeginPostObject<UUID, List<InventoryFolderBase>>(
"POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);
break;
@@ -322,12 +322,12 @@ namespace OpenSim.Grid.UserServer
m_console.Notice("response got");
}
public void NotifyMessageServersUserLoggOff(LLUUID agentID)
public void NotifyMessageServersUserLoggOff(UUID agentID)
{
m_messagesService.TellMessageServersAboutUserLogoff(agentID);
}
public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
public void NotifyMessageServersUserLoggedInToLocation(UUID agentID, UUID sessionID, UUID RegionID,
ulong regionhandle, float positionX, float positionY,
float positionZ, string firstname, string lastname)
{
@@ -335,4 +335,4 @@ namespace OpenSim.Grid.UserServer
positionY, positionZ, firstname, lastname);
}
}
}
}

12
OpenSim/Grid/UserServer/MessageServersConnector.cs
View File

@@ -29,7 +29,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Net;
using System.Reflection;
using libsecondlife;
using OpenMetaverse;
using log4net;
using Nwc.XmlRpc;
using OpenSim.Framework.Servers;
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer
// string scurrentRegionID = (string)requestData["regionid"];
// string sregionhandle = (string)requestData["regionhandle"];
// string scurrentpos = (string)requestData["currentpos"];
//LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
//Vector3.TryParse((string)reader["currentPos"], out retval.currentPos);
// TODO: Okay now raise event so the user server can pass this data to the Usermanager
responseData["responsestring"] = "TRUE";
@@ -155,7 +155,7 @@ namespace OpenSim.Grid.UserServer
return response;
}
public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
public void TellMessageServersAboutUser(UUID agentID, UUID sessionID, UUID RegionID,
ulong regionhandle, float positionX, float positionY,
float positionZ, string firstname, string lastname)
{
@@ -179,7 +179,7 @@ namespace OpenSim.Grid.UserServer
}
}
public void TellMessageServersAboutUserLogoff(LLUUID agentID)
public void TellMessageServersAboutUserLogoff(UUID agentID)
{
lock (MessageServers)
{
@@ -198,7 +198,7 @@ namespace OpenSim.Grid.UserServer
}
}
private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, LLUUID agentID)
private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, UUID agentID)
{
Hashtable reqparams = new Hashtable();
reqparams["sendkey"] = serv.sendkey;
@@ -219,7 +219,7 @@ namespace OpenSim.Grid.UserServer
}
private void NotifyMessageServerAboutUser(MessageServerInfo serv,
LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
UUID agentID, UUID sessionID, UUID RegionID,
ulong regionhandle, float positionX, float positionY, float positionZ,
string firstname, string lastname)
{

14
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using OpenMetaverse;
using log4net;
using Nwc.XmlRpc;
using OpenSim.Data;
@@ -39,7 +39,7 @@ using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Grid.UserServer
{
public delegate void UserLoggedInAtLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
public delegate void UserLoggedInAtLocation(UUID agentID, UUID sessionID, UUID RegionID,
ulong regionhandle, float positionX, float positionY, float positionZ,
string firstname, string lastname);
@@ -151,7 +151,7 @@ namespace OpenSim.Grid.UserServer
int start_z = -1;
// use the homeRegionID if it is stored already. If not, use the regionHandle as before
if (theUser.HomeRegionID != LLUUID.Zero)
if (theUser.HomeRegionID != UUID.Zero)
{
HomeInfo =
RegionProfileData.RequestSimProfileData(
@@ -271,7 +271,7 @@ namespace OpenSim.Grid.UserServer
theUser.CurrentAgent.Handle = SimInfo.regionHandle;
if (start_x >= 0 && start_y >= 0 && start_z >= 0)
{
LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z);
Vector3 tmp_v = new Vector3(start_x, start_y, start_z);
theUser.CurrentAgent.Position = tmp_v;
}
// Prepare notification
@@ -466,7 +466,7 @@ namespace OpenSim.Grid.UserServer
}
// See LoginService
protected override InventoryData GetInventorySkeleton(LLUUID userID)
protected override InventoryData GetInventorySkeleton(UUID userID)
{
m_log.DebugFormat(
"[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
@@ -498,7 +498,7 @@ namespace OpenSim.Grid.UserServer
if (folders != null && folders.Count > 0)
{
LLUUID rootID = LLUUID.Zero;
UUID rootID = UUID.Zero;
ArrayList AgentInventoryArray = new ArrayList();
Hashtable TempHash;
@@ -506,7 +506,7 @@ namespace OpenSim.Grid.UserServer
{
// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
if (InvFolder.ParentID == LLUUID.Zero)
if (InvFolder.ParentID == UUID.Zero)
{
rootID = InvFolder.ID;
}

84
OpenSim/Grid/UserServer/UserManager.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using OpenMetaverse;
using log4net;
using Nwc.XmlRpc;
using OpenSim.Framework;
@@ -38,7 +38,7 @@ using OpenSim.Framework.Servers;
namespace OpenSim.Grid.UserServer
{
public delegate void logOffUser(LLUUID AgentID);
public delegate void logOffUser(UUID AgentID);
public class UserManager : UserManagerBase
{
@@ -79,7 +79,7 @@ namespace OpenSim.Grid.UserServer
return response;
}
public XmlRpcResponse AvatarPickerListtoXmlRPCResponse(LLUUID queryID, List<AvatarPickerAvatar> returnUsers)
public XmlRpcResponse AvatarPickerListtoXmlRPCResponse(UUID queryID, List<AvatarPickerAvatar> returnUsers)
{
XmlRpcResponse response = new XmlRpcResponse();
Hashtable responseData = new Hashtable();
@@ -108,8 +108,8 @@ namespace OpenSim.Grid.UserServer
for (int i = 0; i < returnUsers.Count; i++)
{
responseData["ownerID" + i] = returnUsers[i].FriendListOwner.UUID.ToString();
responseData["friendID" + i] = returnUsers[i].Friend.UUID.ToString();
responseData["ownerID" + i] = returnUsers[i].FriendListOwner.ToString();
responseData["friendID" + i] = returnUsers[i].Friend.ToString();
responseData["ownerPerms" + i] = returnUsers[i].FriendListOwnerPerms.ToString();
responseData["friendPerms" + i] = returnUsers[i].FriendPerms.ToString();
}
@@ -172,11 +172,11 @@ namespace OpenSim.Grid.UserServer
// XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable) request.Params[0];
List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>();
LLUUID queryID = new LLUUID(LLUUID.Zero.ToString());
UUID queryID = new UUID(UUID.Zero.ToString());
if (requestData.Contains("avquery") && requestData.Contains("queryid"))
{
queryID = new LLUUID((string) requestData["queryid"]);
queryID = new UUID((string) requestData["queryid"]);
returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]);
}
@@ -195,13 +195,13 @@ namespace OpenSim.Grid.UserServer
requestData.Contains("region_uuid"))
{
// ulong cregionhandle = 0;
LLUUID regionUUID;
LLUUID avatarUUID;
UUID regionUUID;
UUID avatarUUID;
Helpers.TryParse((string) requestData["avatar_id"], out avatarUUID);
Helpers.TryParse((string) requestData["region_uuid"], out regionUUID);
UUID.TryParse((string) requestData["avatar_id"], out avatarUUID);
UUID.TryParse((string) requestData["region_uuid"], out regionUUID);
if (avatarUUID != LLUUID.Zero)
if (avatarUUID != UUID.Zero)
{
UserProfileData userProfile = GetUserProfile(avatarUUID);
userProfile.CurrentAgent.Region = regionUUID;
@@ -231,8 +231,8 @@ namespace OpenSim.Grid.UserServer
requestData.Contains("friendPerms"))
{
// UserManagerBase.AddNewuserFriend
AddNewUserFriend(new LLUUID((string) requestData["ownerID"]),
new LLUUID((string) requestData["friendID"]),
AddNewUserFriend(new UUID((string) requestData["ownerID"]),
new UUID((string) requestData["friendID"]),
(uint) Convert.ToInt32((string) requestData["friendPerms"]));
returnString = "TRUE";
}
@@ -252,8 +252,8 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("ownerID") && requestData.Contains("friendID"))
{
// UserManagerBase.AddNewuserFriend
RemoveUserFriend(new LLUUID((string) requestData["ownerID"]),
new LLUUID((string) requestData["friendID"]));
RemoveUserFriend(new UUID((string) requestData["ownerID"]),
new UUID((string) requestData["friendID"]));
returnString = "TRUE";
}
responseData["returnString"] = returnString;
@@ -271,8 +271,8 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("ownerID") && requestData.Contains("friendID") &&
requestData.Contains("friendPerms"))
{
UpdateUserFriendPerms(new LLUUID((string) requestData["ownerID"]),
new LLUUID((string) requestData["friendID"]),
UpdateUserFriendPerms(new UUID((string) requestData["ownerID"]),
new UUID((string) requestData["friendID"]),
(uint) Convert.ToInt32((string) requestData["friendPerms"]));
// UserManagerBase.
returnString = "TRUE";
@@ -292,7 +292,7 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("ownerID"))
{
returndata = GetUserFriendList(new LLUUID((string) requestData["ownerID"]));
returndata = GetUserFriendList(new UUID((string) requestData["ownerID"]));
}
return FriendListItemListtoXmlRPCResponse(returndata);
@@ -306,7 +306,7 @@ namespace OpenSim.Grid.UserServer
Hashtable responseData;
if (requestData.Contains("owner"))
{
appearance = GetUserAppearance(new LLUUID((string) requestData["owner"]));
appearance = GetUserAppearance(new UUID((string) requestData["owner"]));
if (appearance == null)
{
responseData = new Hashtable();
@@ -337,7 +337,7 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("owner"))
{
AvatarAppearance appearance = new AvatarAppearance(requestData);
UpdateUserAppearance(new LLUUID((string) requestData["owner"]), appearance);
UpdateUserAppearance(new UUID((string) requestData["owner"]), appearance);
responseData = new Hashtable();
responseData["returnString"] = "TRUE";
}
@@ -396,7 +396,7 @@ namespace OpenSim.Grid.UserServer
{
try
{
LLUUID guess = new LLUUID((string) requestData["avatar_uuid"]);
UUID guess = new UUID((string) requestData["avatar_uuid"]);
userProfile = GetUserProfile(guess);
}
@@ -427,11 +427,11 @@ namespace OpenSim.Grid.UserServer
//CFK: Console.WriteLine("METHOD BY UUID CALLED");
if (requestData.Contains("avatar_uuid"))
{
LLUUID guess;
UUID guess;
Helpers.TryParse((string) requestData["avatar_uuid"], out guess);
UUID.TryParse((string) requestData["avatar_uuid"], out guess);
if (guess == LLUUID.Zero)
if (guess == UUID.Zero)
{
return CreateUnknownUserErrorResponse();
}
@@ -476,16 +476,16 @@ namespace OpenSim.Grid.UserServer
string authed = "FALSE";
if (requestData.Contains("avatar_uuid") && requestData.Contains("session_id"))
{
LLUUID guess_aid;
LLUUID guess_sid;
UUID guess_aid;
UUID guess_sid;
Helpers.TryParse((string) requestData["avatar_uuid"], out guess_aid);
if (guess_aid == LLUUID.Zero)
UUID.TryParse((string) requestData["avatar_uuid"], out guess_aid);
if (guess_aid == UUID.Zero)
{
return CreateUnknownUserErrorResponse();
}
Helpers.TryParse((string) requestData["session_id"], out guess_sid);
if (guess_sid == LLUUID.Zero)
UUID.TryParse((string) requestData["session_id"], out guess_sid);
if (guess_sid == UUID.Zero)
{
return CreateUnknownUserErrorResponse();
}
@@ -520,7 +520,7 @@ namespace OpenSim.Grid.UserServer
return CreateUnknownUserErrorResponse();
}
LLUUID UserUUID = new LLUUID((string) requestData["avatar_uuid"]);
UUID UserUUID = new UUID((string) requestData["avatar_uuid"]);
UserProfileData userProfile = GetUserProfile(UserUUID);
if (null == userProfile)
{
@@ -532,11 +532,11 @@ namespace OpenSim.Grid.UserServer
}
if (requestData.Contains("FLImageID"))
{
userProfile.FirstLifeImage = new LLUUID((string) requestData["FLImageID"]);
userProfile.FirstLifeImage = new UUID((string) requestData["FLImageID"]);
}
if (requestData.Contains("ImageID"))
{
userProfile.Image = new LLUUID((string) requestData["ImageID"]);
userProfile.Image = new UUID((string) requestData["ImageID"]);
}
// dont' know how yet
if (requestData.Contains("MaturePublish"))
@@ -575,8 +575,8 @@ namespace OpenSim.Grid.UserServer
}
if (requestData.Contains("home_region_id"))
{
LLUUID regionID;
LLUUID.TryParse((string) requestData["home_region_id"], out regionID);
UUID regionID;
UUID.TryParse((string) requestData["home_region_id"], out regionID);
userProfile.HomeRegionID = regionID;
}
if (requestData.Contains("home_pos_x"))
@@ -682,7 +682,7 @@ namespace OpenSim.Grid.UserServer
{
try
{
userProfile.Partner = new LLUUID((string) requestData["partner"]);
userProfile.Partner = new UUID((string) requestData["partner"]);
}
catch (InvalidCastException)
{
@@ -691,7 +691,7 @@ namespace OpenSim.Grid.UserServer
}
else
{
userProfile.Partner = LLUUID.Zero;
userProfile.Partner = UUID.Zero;
}
// call plugin!
@@ -710,8 +710,8 @@ namespace OpenSim.Grid.UserServer
{
try
{
LLUUID userUUID = new LLUUID((string) requestData["avatar_uuid"]);
LLUUID RegionID = new LLUUID((string) requestData["region_uuid"]);
UUID userUUID = new UUID((string) requestData["avatar_uuid"]);
UUID RegionID = new UUID((string) requestData["region_uuid"]);
ulong regionhandle = (ulong) Convert.ToInt64((string) requestData["region_handle"]);
float posx = (float) Convert.ToDecimal((string) requestData["region_pos_x"]);
float posy = (float) Convert.ToDecimal((string) requestData["region_pos_y"]);
@@ -749,9 +749,9 @@ namespace OpenSim.Grid.UserServer
throw new Exception("The method or operation is not implemented.");
}
public override UserProfileData SetupMasterUser(LLUUID uuid)
public override UserProfileData SetupMasterUser(UUID uuid)
{
throw new Exception("The method or operation is not implemented.");
}
}
}
}