ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
This commit is contained in:
Melanie
2013-08-17 03:23:45 +01:00
parent df7a1e68f6 85a9cb260a
commit bef03fb30b
28 changed files with 417 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
View File

@@ -85,7 +85,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
data.destinationServerURI = args["destination_serveruri"];
}
catch (InvalidCastException e)
catch (InvalidCastException)
{
m_log.ErrorFormat("[HOME AGENT HANDLER]: Bad cast in UnpackData");
}

6
OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
View File

@@ -453,7 +453,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
XmlRpcResponse response = new XmlRpcResponse();
response.Value = hash;
return response;
}
/// <summary>
@@ -471,9 +470,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
//string portstr = (string)requestData["port"];
if (requestData.ContainsKey("first") && requestData.ContainsKey("last"))
{
UUID userID = UUID.Zero;
string first = (string)requestData["first"];
string last = (string)requestData["last"];
UUID uuid = m_HomeUsersService.GetUUID(first, last);
hash["UUID"] = uuid.ToString();
@@ -482,7 +479,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
XmlRpcResponse response = new XmlRpcResponse();
response.Value = hash;
return response;
}
}
}
}

6
OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
View File

@@ -39,8 +39,7 @@ namespace OpenSim.Server.Handlers.Profiles
{
public class UserProfilesConnector: ServiceConnector
{
static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// Our Local Module
public IUserProfilesService ServiceModule
@@ -110,5 +109,4 @@ namespace OpenSim.Server.Handlers.Profiles
Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
}
}
}
}