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

viewers do caps before knowing where they are. Tell them to take a walk and try later on 2 cases

Browse Source
This commit is contained in:
UbitUmarov
2020-10-11 17:56:20 +01:00
parent 511012dc50
commit 3e5813a0c3
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@@ -307,6 +307,14 @@ namespace OpenSim.Region.ClientStack.Linden
return;
}
ScenePresence sp = m_scene.GetScenePresence(agentID);
if (sp == null)
{
response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
response.AddHeader("Retry-After", "5");
return;
}
OSDMap copy = DeepCopy();
// Let's add the agentID to the destination guide, if it is expecting that.

37
OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
View File

@@ -465,21 +465,17 @@ namespace OpenSim.Region.CoreModules.World.LightShare
}
}
ViewerEnvironment VEnv = null;
ScenePresence sp = m_scene.GetScenePresence(agentID);
if(sp != null && sp.Environment != null)
if (sp == null)
{
//if (parcelid == -1)
VEnv = sp.Environment;
//else
//{
// OSD def = ViewerEnvironment.DefaultToOSD(regionID, parcelid);
// httpResponse.RawBuffer = OSDParser.SerializeLLSDXmlToBytes(def);
// httpResponse.StatusCode = (int)HttpStatusCode.OK;
// return;
//}
httpResponse.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
httpResponse.AddHeader("Retry-After", "5");
return;
}
ViewerEnvironment VEnv = null;
if (sp.Environment != null)
VEnv = sp.Environment;
else if (parcelid == -1)
VEnv = GetRegionEnvironment();
else
@@ -499,17 +495,6 @@ namespace OpenSim.Region.CoreModules.World.LightShare
}
}
//OSDMap map = new OSDMap();
//OSDMap cenv = (OSDMap)VEnv.ToOSD();
//cenv["parcel_id"] = parcelid;
//cenv["region_id"] = regionID;
//map["environment"] = cenv;
//map["parcel_id"] = parcelid;
//map["success"] = true;
//string env = OSDParser.SerializeLLSDXmlString(map);
//if (String.IsNullOrEmpty(env))
byte[] envBytes = VEnv.ToCapBytes(regionID, parcelid);
if(envBytes == null)
{
@@ -708,14 +693,14 @@ namespace OpenSim.Region.CoreModules.World.LightShare
ViewerEnvironment VEnv = null;
ScenePresence sp = m_scene.GetScenePresence(agentID);
if(sp == null)
if (sp == null)
{
response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
response.AddHeader("Retry-After", "10");
response.AddHeader("Retry-After", "5");
return;
}
if(sp.Environment != null)
if (sp.Environment != null)
VEnv = sp.Environment;
else
{