mirror of
https://github.com/opensim/opensim.git
synced 2026-08-14 09:25:45 +08:00
* Fixed an annoying pop-up box when crossing borders.
This commit is contained in:
@@ -258,9 +258,17 @@ namespace OpenSim.Region.Environment.Modules
|
||||
}
|
||||
else
|
||||
{
|
||||
bool childYN = true;
|
||||
ScenePresence agent = null;
|
||||
//client.SecureSessionId;
|
||||
Scene s = GetRandomScene();
|
||||
Scene s = LocateSceneClientIn(client.AgentId);
|
||||
if (s != null)
|
||||
{
|
||||
agent = s.GetScenePresence(client.AgentId);
|
||||
if (agent != null)
|
||||
childYN = agent.IsChildAgent;
|
||||
}
|
||||
if (s != null && agent != null && childYN == false)
|
||||
{
|
||||
//s.RegionInfo.RegionHandle;
|
||||
LLUUID agentID = LLUUID.Zero;
|
||||
@@ -846,7 +854,7 @@ namespace OpenSim.Region.Environment.Modules
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("Unable to get funds.");
|
||||
//throw new Exception("Unable to get funds.");
|
||||
}
|
||||
}
|
||||
return returnfunds;
|
||||
|
||||
@@ -2792,7 +2792,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (part.OwnerID == parcel.landData.ownerID)
|
||||
|
||||
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
public LLUUID ObjectOwner
|
||||
{
|
||||
get { return OwnerID; }
|
||||
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
|
||||
return newobject;
|
||||
}
|
||||
|
||||
|
||||
public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim)
|
||||
{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user