aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-06-24 17:01:08 +0000
committerAdam Frisby2007-06-24 17:01:08 +0000
commit980a8cc629fe1228d450fa705fec3bacc3a84d98 (patch)
tree846a3fa7af7994a4c4948c46e28a3a5014f89251 /OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
parentA bit more work on the AssetCache. (diff)
downloadopensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.zip
opensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.tar.gz
opensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.tar.bz2
opensim-SC_OLD-980a8cc629fe1228d450fa705fec3bacc3a84d98.tar.xz
Refactoring:
* Renamed IPListenAddr to CommsIPListenAddr * Renamed IPListenPort to CommsIPListenPort New Features: * Begun OGS/.1 implementation -- created new temporary "GridInfo" class to hold grid settings, needs reworking to wherever settings are stored these days.
Diffstat (limited to 'OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs')
-rw-r--r--OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
index b8c6c3b..a7f7aa4 100644
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -87,11 +87,11 @@ namespace OpenSim.LocalCommunications
87 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + 87 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
88 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 88 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
89 string capsPath = Util.GetRandomCapsPath(); 89 string capsPath = Util.GetRandomCapsPath();
90 response.SimAddress = reg.IPListenAddr; 90 response.SimAddress = reg.CommsIPListenAddr;
91 response.SimPort = (Int32)reg.IPListenPort; 91 response.SimPort = (Int32)reg.CommsIPListenPort;
92 response.RegionX = reg.RegionLocX ; 92 response.RegionX = reg.RegionLocX ;
93 response.RegionY = reg.RegionLocY ; 93 response.RegionY = reg.RegionLocY ;
94 response.SeedCapability = "http://" + reg.IPListenAddr + ":" + "9000" + "/CAPS/"+capsPath +"0000/"; 94 response.SeedCapability = "http://" + reg.CommsIPListenAddr + ":" + "9000" + "/CAPS/" + capsPath + "0000/";
95 theUser.currentAgent.currentRegion = reg.SimUUID; 95 theUser.currentAgent.currentRegion = reg.SimUUID;
96 theUser.currentAgent.currentHandle = reg.RegionHandle; 96 theUser.currentAgent.currentHandle = reg.RegionHandle;
97 97