mirror of
https://github.com/opensim/opensim.git
synced 2026-07-13 19:14:51 +08:00
* Added null exception handler where we couldn't locate a user data record in the cache for the user
* More OGP tweaks to make it play nice in an error condition. * Still Experimental.
This commit is contained in:
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
|
||||
//int RegionPort = (int)reg.HttpPort;
|
||||
|
||||
UUID RemoteAgentID = requestMap["agent_id"].AsUUID();
|
||||
|
||||
|
||||
// will be used in the future. The client always connects with the aditi agentid currently
|
||||
UUID LocalAgentID = RemoteAgentID;
|
||||
|
||||
@@ -342,6 +342,15 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
|
||||
UpdateOGPState(LocalAgentID, userState);
|
||||
|
||||
LLSDMap responseMap = new LLSDMap();
|
||||
|
||||
if (RemoteAgentID == UUID.Zero)
|
||||
{
|
||||
responseMap["connect"] = LLSD.FromBoolean(false);
|
||||
responseMap["message"] = LLSD.FromString("No agent ID was specified in rez_avatar/request");
|
||||
m_log.Error("[OGP]: rez_avatar/request failed because no avatar UUID was provided in the request body");
|
||||
return responseMap;
|
||||
}
|
||||
|
||||
responseMap["sim_host"] = LLSD.FromString(reg.ExternalHostName);
|
||||
|
||||
// DEPRECIATED
|
||||
|
||||
Reference in New Issue
Block a user