diff options
author | Adam Frisby | 2007-07-14 22:35:47 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-14 22:35:47 +0000 |
commit | 2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e (patch) | |
tree | 0855803d694abaad00b87c3ab7766dd16dff69ee /OpenSim/Grid/UserServer | |
parent | * libterrain now builds again (diff) | |
download | opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.zip opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.gz opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.bz2 opensim-SC-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.xz |
* Excelsior!
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 6fae0a8..ca0cdc3 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -30,6 +30,7 @@ using System.Collections; | |||
30 | using Nwc.XmlRpc; | 30 | using Nwc.XmlRpc; |
31 | using OpenSim.Framework.Data; | 31 | using OpenSim.Framework.Data; |
32 | using OpenSim.Framework.UserManagement; | 32 | using OpenSim.Framework.UserManagement; |
33 | using OpenSim.Framework.Utilities; | ||
33 | 34 | ||
34 | namespace OpenSim.Grid.UserServer | 35 | namespace OpenSim.Grid.UserServer |
35 | { | 36 | { |
@@ -63,6 +64,10 @@ namespace OpenSim.Grid.UserServer | |||
63 | response.RegionX = SimInfo.regionLocX; | 64 | response.RegionX = SimInfo.regionLocX; |
64 | response.RegionY = SimInfo.regionLocX; | 65 | response.RegionY = SimInfo.regionLocX; |
65 | 66 | ||
67 | //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI | ||
68 | string capsPath = Util.GetRandomCapsPath(); | ||
69 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; | ||
70 | |||
66 | // Notify the target of an incoming user | 71 | // Notify the target of an incoming user |
67 | Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")"); | 72 | Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")"); |
68 | 73 | ||
@@ -78,6 +83,7 @@ namespace OpenSim.Grid.UserServer | |||
78 | SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString(); | 83 | SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString(); |
79 | SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString(); | 84 | SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString(); |
80 | SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString(); | 85 | SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString(); |
86 | SimParams["caps_path"] = capsPath; | ||
81 | ArrayList SendParams = new ArrayList(); | 87 | ArrayList SendParams = new ArrayList(); |
82 | SendParams.Add(SimParams); | 88 | SendParams.Add(SimParams); |
83 | 89 | ||