From 00d61145255d08ccd4bcc0e60262cbedabf08476 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 14 Nov 2008 21:06:40 +0000
Subject: * test: Add scene root agent test stub, since I'll be picking up with
something else the next time I start coding on OpenSim
---
OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 11 +++++++++--
OpenSim/Region/Communications/Local/LocalLoginService.cs | 4 +---
2 files changed, 10 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Communications/Local')
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index ddba124..552f8c3 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Region.Communications.Local
}
///
- ///
+ /// Tell a region to expect a new client connection.
///
///
///
@@ -355,6 +355,14 @@ namespace OpenSim.Region.Communications.Local
return false;
}
+ ///
+ /// Tell a region to expect the crossing in of a new prim.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod)
{
if (m_regionListeners.ContainsKey(regionHandle))
@@ -431,7 +439,6 @@ namespace OpenSim.Region.Communications.Local
agent.BaseFolder = loginData.BaseFolder;
agent.InventoryFolder = loginData.InventoryFolder;
agent.startpos = loginData.StartPos;
-
agent.CapsPath = loginData.CapsPath;
TriggerExpectUser(regionHandle, agent);
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 70be635..9caeda4 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -176,6 +176,7 @@ namespace OpenSim.Region.Communications.Local
regionX, regionY,
theUser.HomeLocation.X, theUser.HomeLocation.Y, theUser.HomeLocation.Z,
theUser.HomeLookAt.X, theUser.HomeLookAt.Y, theUser.HomeLookAt.Z);
+
m_log.InfoFormat("[LOGIN] Home region of user {0} {1} is not available; using computed region position {2} {3}",
theUser.FirstName, theUser.SurName,
regionX, regionY);
@@ -318,9 +319,6 @@ namespace OpenSim.Region.Communications.Local
seedcap = "http://" + regionInfo.ExternalEndPoint.Address.ToString() + ":" + serversInfo.HttpListenerPort + "/CAPS/" + capsPath + "0000/";
}
-
-
-
response.SeedCapability = seedcap; //regionInfo.ExternalEndPoint.Address.ToString() + ":" + regionInfo.HttpPort + "/CAPS/" + capsPath + "0000/";
// Notify the target of an incoming user
--
cgit v1.1