ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged

Browse Source
This commit is contained in:
John Hurliman
2010-09-12 14:21:51 -07:00
parent 0db1ed0b5a f1f0bc23f4
commit c03b24cbfd
96 changed files with 920 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
View File

@@ -86,7 +86,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
paramList.Add(hash);
XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/" );
string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/");
m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
XmlRpcResponse response = null;
try

2
OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
View File

@@ -526,7 +526,7 @@ namespace OpenSim.Services.Connectors
InventoryFolderBase folder = new InventoryFolderBase();
try
{
{
folder.ParentID = new UUID(data["ParentID"].ToString());
folder.Type = short.Parse(data["Type"].ToString());
folder.Version = ushort.Parse(data["Version"].ToString());

4
OpenSim/Services/InventoryService/InventoryService.cs
View File

@@ -276,11 +276,11 @@ namespace OpenSim.Services.InventoryService
List<InventoryFolderBase> folders = RequestSubFolders(root.ID);
foreach (InventoryFolderBase folder in folders)
{
{
if (folder.Type == (short)type)
{
// m_log.DebugFormat(
// "[INVENTORY SERVICE]: Found folder {0} type {1}", folder.Name, (AssetType)folder.Type);
// "[INVENTORY SERVICE]: Found folder {0} type {1}", folder.Name, (AssetType)folder.Type);
return folder;
}

2
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -308,7 +308,7 @@ namespace OpenSim.Services.LLLoginService
{
// something went wrong, make something up, so that we don't have to test this anywhere else
guinfo = new GridUserInfo();
guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30);
guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30);
}
//

20
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@@ -97,10 +97,10 @@ namespace OpenSim.Services.UserAccountService
public UserAccount GetUserAccount(UUID scopeID, string firstName,
string lastName)
{
// m_log.DebugFormat(
// "[USER ACCOUNT SERVICE]: Retrieving account by username for {0} {1}, scope {2}",
// firstName, lastName, scopeID);
// m_log.DebugFormat(
// "[USER ACCOUNT SERVICE]: Retrieving account by username for {0} {1}, scope {2}",
// firstName, lastName, scopeID);
UserAccountData[] d;
if (scopeID != UUID.Zero)
@@ -235,10 +235,10 @@ namespace OpenSim.Services.UserAccountService
public bool StoreUserAccount(UserAccount data)
{
// m_log.DebugFormat(
// "[USER ACCOUNT SERVICE]: Storing user account for {0} {1} {2}, scope {3}",
// data.FirstName, data.LastName, data.PrincipalID, data.ScopeID);
// m_log.DebugFormat(
// "[USER ACCOUNT SERVICE]: Storing user account for {0} {1} {2}, scope {3}",
// data.FirstName, data.LastName, data.PrincipalID, data.ScopeID);
UserAccountData d = new UserAccountData();
d.FirstName = data.FirstName;
@@ -285,7 +285,7 @@ namespace OpenSim.Services.UserAccountService
#endregion
#region Console commands
/// <summary>
/// Handle the create user command from the console.
/// </summary>
@@ -296,7 +296,7 @@ namespace OpenSim.Services.UserAccountService
string lastName;
string password;
string email;
List<char> excluded = new List<char>(new char[]{' '});
if (cmdparams.Length < 3)