aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs16
-rw-r--r--OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs18
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs64
-rw-r--r--OpenSim/Grid/GridServer/IGridPlugin.cs2
-rw-r--r--OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs38
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs16
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs4
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs6
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs6
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs10
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs10
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs42
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs10
-rw-r--r--OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs2
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs4
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs10
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs4
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs6
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs4
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs10
-rw-r--r--OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Grid/UserServer/Main.cs46
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs22
-rw-r--r--OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs52
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs20
29 files changed, 231 insertions, 231 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 1b1f9c7..2aca8ff 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -48,11 +48,11 @@ namespace OpenSim.Grid.AssetServer
48 48
49 public AssetConfig m_config; 49 public AssetConfig m_config;
50 50
51 public static OpenAsset_Main assetserver; 51 public static OpenAsset_Main assetserver;
52 52
53 // Temporarily hardcoded - should be a plugin 53 // Temporarily hardcoded - should be a plugin
54 protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); 54 protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
55 55
56 private IAssetProvider m_assetProvider; 56 private IAssetProvider m_assetProvider;
57 57
58 [STAThread] 58 [STAThread]
@@ -81,7 +81,7 @@ namespace OpenSim.Grid.AssetServer
81 public OpenAsset_Main() 81 public OpenAsset_Main()
82 { 82 {
83 m_console = new ConsoleBase("OpenAsset", this); 83 m_console = new ConsoleBase("OpenAsset", this);
84 84
85 MainConsole.Instance = m_console; 85 MainConsole.Instance = m_console;
86 } 86 }
87 87
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.AssetServer
166 166
167 public void LoadDefaultAssets() 167 public void LoadDefaultAssets()
168 { 168 {
169 assetLoader.ForEachDefaultXmlAsset(StoreAsset); 169 assetLoader.ForEachDefaultXmlAsset(StoreAsset);
170 } 170 }
171 171
172 protected void StoreAsset(AssetBase asset) 172 protected void StoreAsset(AssetBase asset)
@@ -177,9 +177,9 @@ namespace OpenSim.Grid.AssetServer
177 public override void RunCmd(string cmd, string[] cmdparams) 177 public override void RunCmd(string cmd, string[] cmdparams)
178 { 178 {
179 base.RunCmd(cmd, cmdparams); 179 base.RunCmd(cmd, cmdparams);
180 180
181 switch (cmd) 181 switch (cmd)
182 { 182 {
183 case "shutdown": 183 case "shutdown":
184 m_console.Close(); 184 m_console.Close();
185 Environment.Exit(0); 185 Environment.Exit(0);
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index 6f219a6..52c6e8e 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index ece826e..fcf99cd 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.AssetServer
58 m_assetManager = assetManager; 58 m_assetManager = assetManager;
59 m_assetProvider = assetProvider; 59 m_assetProvider = assetProvider;
60 } 60 }
61 61
62 public override byte[] Handle(string path, Stream request) 62 public override byte[] Handle(string path, Stream request)
63 { 63 {
64 string param = GetParam(path); 64 string param = GetParam(path);
@@ -68,18 +68,18 @@ namespace OpenSim.Grid.AssetServer
68 68
69 if (p.Length > 0) 69 if (p.Length > 0)
70 { 70 {
71 LLUUID assetID = null; 71 LLUUID assetID = null;
72 72
73 if (!LLUUID.TryParse(p[0], out assetID)) 73 if (!LLUUID.TryParse(p[0], out assetID))
74 { 74 {
75 m_log.InfoFormat( 75 m_log.InfoFormat(
76 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); 76 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
77 return result; 77 return result;
78 } 78 }
79 79
80 if (StatsManager.AssetStats != null) 80 if (StatsManager.AssetStats != null)
81 StatsManager.AssetStats.AddRequest(); 81 StatsManager.AssetStats.AddRequest();
82 82
83 AssetBase asset = m_assetProvider.FetchAsset(assetID); 83 AssetBase asset = m_assetProvider.FetchAsset(assetID);
84 if (asset != null) 84 if (asset != null)
85 { 85 {
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.AssetServer
94 //StreamReader sr = new StreamReader(ms); 94 //StreamReader sr = new StreamReader(ms);
95 95
96 result = ms.GetBuffer(); 96 result = ms.GetBuffer();
97 97
98 m_log.InfoFormat( 98 m_log.InfoFormat(
99 "[REST]: GET:/asset found {0} with name {1}, size {2} bytes", 99 "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
100 assetID, asset.Name, result.Length); 100 assetID, asset.Name, result.Length);
@@ -105,13 +105,13 @@ namespace OpenSim.Grid.AssetServer
105 { 105 {
106 if (StatsManager.AssetStats != null) 106 if (StatsManager.AssetStats != null)
107 StatsManager.AssetStats.AddNotFoundRequest(); 107 StatsManager.AssetStats.AddNotFoundRequest();
108 108
109 m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID); 109 m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
110 } 110 }
111 } 111 }
112 112
113 return result; 113 return result;
114 } 114 }
115 } 115 }
116 116
117 public class PostAssetStreamHandler : BaseStreamHandler 117 public class PostAssetStreamHandler : BaseStreamHandler
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index c2c212c..83b5319 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -243,22 +243,22 @@ namespace OpenSim.Grid.GridServer
243 243
244 /// <summary> 244 /// <summary>
245 /// Checks that it's valid to replace the existing region data with new data 245 /// Checks that it's valid to replace the existing region data with new data
246 /// 246 ///
247 /// Currently, this means ensure that the keys passed in by the new region 247 /// Currently, this means ensure that the keys passed in by the new region
248 /// match those in the original region. (XXX Is this correct? Shouldn't we simply check 248 /// match those in the original region. (XXX Is this correct? Shouldn't we simply check
249 /// against the keys in the current configuration?) 249 /// against the keys in the current configuration?)
250 /// </summary> 250 /// </summary>
251 /// <param name="sim"></param> 251 /// <param name="sim"></param>
252 /// <returns></returns> 252 /// <returns></returns>
253 protected virtual void ValidateOverwriteKeys(RegionProfileData sim, RegionProfileData existingSim) 253 protected virtual void ValidateOverwriteKeys(RegionProfileData sim, RegionProfileData existingSim)
254 { 254 {
255 if (!(existingSim.regionRecvKey == sim.regionRecvKey && existingSim.regionSendKey == sim.regionSendKey)) 255 if (!(existingSim.regionRecvKey == sim.regionRecvKey && existingSim.regionSendKey == sim.regionSendKey))
256 { 256 {
257 throw new LoginException( 257 throw new LoginException(
258 String.Format( 258 String.Format(
259 "Authentication failed when trying to login existing region {0} at location {1} {2} currently occupied by {3}" 259 "Authentication failed when trying to login existing region {0} at location {1} {2} currently occupied by {3}"
260 + " with the region's send key {4} (expected {5}) and the region's receive key {6} (expected {7})", 260 + " with the region's send key {4} (expected {5}) and the region's receive key {6} (expected {7})",
261 sim.regionName, sim.regionLocX, sim.regionLocY, existingSim.regionName, 261 sim.regionName, sim.regionLocX, sim.regionLocY, existingSim.regionName,
262 sim.regionSendKey, existingSim.regionSendKey, sim.regionRecvKey, existingSim.regionRecvKey), 262 sim.regionSendKey, existingSim.regionSendKey, sim.regionRecvKey, existingSim.regionRecvKey),
263 "The keys required to login your region did not match the grid server keys. Please check your grid send and receive keys."); 263 "The keys required to login your region did not match the grid server keys. Please check your grid send and receive keys.");
264 } 264 }
@@ -266,25 +266,25 @@ namespace OpenSim.Grid.GridServer
266 266
267 /// <summary> 267 /// <summary>
268 /// Checks that the new region data is valid. 268 /// Checks that the new region data is valid.
269 /// 269 ///
270 /// Currently, this means checking that the keys passed in by the new region 270 /// Currently, this means checking that the keys passed in by the new region
271 /// match those in the grid server's configuration. 271 /// match those in the grid server's configuration.
272 /// </summary> 272 /// </summary>
273 /// 273 ///
274 /// <param name="sim"></param> 274 /// <param name="sim"></param>
275 /// <exception cref="LoginException">Thrown if region login failed</exception> 275 /// <exception cref="LoginException">Thrown if region login failed</exception>
276 protected virtual void ValidateNewRegionKeys(RegionProfileData sim) 276 protected virtual void ValidateNewRegionKeys(RegionProfileData sim)
277 { 277 {
278 if (!(sim.regionRecvKey == Config.SimSendKey && sim.regionSendKey == Config.SimRecvKey)) 278 if (!(sim.regionRecvKey == Config.SimSendKey && sim.regionSendKey == Config.SimRecvKey))
279 { 279 {
280 throw new LoginException( 280 throw new LoginException(
281 String.Format( 281 String.Format(
282 "Authentication failed when trying to login new region {0} at location {1} {2}" 282 "Authentication failed when trying to login new region {0} at location {1} {2}"
283 + " with the region's send key {3} (expected {4}) and the region's receive key {5} (expected {6})", 283 + " with the region's send key {3} (expected {4}) and the region's receive key {5} (expected {6})",
284 sim.regionName, sim.regionLocX, sim.regionLocY, 284 sim.regionName, sim.regionLocX, sim.regionLocY,
285 sim.regionSendKey, Config.SimRecvKey, sim.regionRecvKey, Config.SimSendKey), 285 sim.regionSendKey, Config.SimRecvKey, sim.regionRecvKey, Config.SimSendKey),
286 "The keys required to login your region did not match your existing region keys. Please check your grid send and receive keys."); 286 "The keys required to login your region did not match your existing region keys. Please check your grid send and receive keys.");
287 } 287 }
288 } 288 }
289 289
290 /// <summary> 290 /// <summary>
@@ -295,13 +295,13 @@ namespace OpenSim.Grid.GridServer
295 protected virtual void ValidateRegionContactable(RegionProfileData sim) 295 protected virtual void ValidateRegionContactable(RegionProfileData sim)
296 { 296 {
297 string regionStatusUrl = String.Format("{0}{1}", sim.httpServerURI, "simstatus/"); 297 string regionStatusUrl = String.Format("{0}{1}", sim.httpServerURI, "simstatus/");
298 string regionStatusResponse; 298 string regionStatusResponse;
299 299
300 RestClient rc = new RestClient(regionStatusUrl); 300 RestClient rc = new RestClient(regionStatusUrl);
301 rc.RequestMethod = "GET"; 301 rc.RequestMethod = "GET";
302 302
303 m_log.DebugFormat("[LOGIN]: Contacting {0} for status of region {1}", regionStatusUrl, sim.regionName); 303 m_log.DebugFormat("[LOGIN]: Contacting {0} for status of region {1}", regionStatusUrl, sim.regionName);
304 304
305 try 305 try
306 { 306 {
307 Stream rs = rc.Request(); 307 Stream rs = rc.Request();
@@ -314,21 +314,21 @@ namespace OpenSim.Grid.GridServer
314 throw new LoginException( 314 throw new LoginException(
315 String.Format("Region status request to {0} failed", regionStatusUrl), 315 String.Format("Region status request to {0} failed", regionStatusUrl),
316 String.Format( 316 String.Format(
317 "The grid service could not contact the http url {0} at your region. Please make sure this url is reachable by the grid service", 317 "The grid service could not contact the http url {0} at your region. Please make sure this url is reachable by the grid service",
318 regionStatusUrl), 318 regionStatusUrl),
319 e); 319 e);
320 } 320 }
321 321
322 if (!regionStatusResponse.Equals("OK")) 322 if (!regionStatusResponse.Equals("OK"))
323 { 323 {
324 throw new LoginException( 324 throw new LoginException(
325 String.Format( 325 String.Format(
326 "Region {0} at {1} returned status response {2} rather than {3}", 326 "Region {0} at {1} returned status response {2} rather than {3}",
327 sim.regionName, regionStatusUrl, regionStatusResponse, "OK"), 327 sim.regionName, regionStatusUrl, regionStatusResponse, "OK"),
328 String.Format( 328 String.Format(
329 "When the grid service asked for the status of your region, it received the response {0} rather than {1}. Please check your status", 329 "When the grid service asked for the status of your region, it received the response {0} rather than {1}. Please check your status",
330 regionStatusResponse, "OK")); 330 regionStatusResponse, "OK"));
331 } 331 }
332 } 332 }
333 333
334 /// <summary> 334 /// <summary>
@@ -373,11 +373,11 @@ namespace OpenSim.Grid.GridServer
373 m_log.Warn("[LOGIN PRELUDE]: Invalid login parameters, sending back error response."); 373 m_log.Warn("[LOGIN PRELUDE]: Invalid login parameters, sending back error response.");
374 return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString()); 374 return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString());
375 } 375 }
376 376
377 m_log.InfoFormat("[LOGIN BEGIN]: Received login request from simulator: {0}", sim.regionName); 377 m_log.InfoFormat("[LOGIN BEGIN]: Received login request from simulator: {0}", sim.regionName);
378 378
379 existingSim = GetRegion(sim.regionHandle); 379 existingSim = GetRegion(sim.regionHandle);
380 380
381 if (existingSim == null || existingSim.UUID == sim.UUID || sim.UUID != sim.originUUID) 381 if (existingSim == null || existingSim.UUID == sim.UUID || sim.UUID != sim.originUUID)
382 { 382 {
383 try 383 try
@@ -390,13 +390,13 @@ namespace OpenSim.Grid.GridServer
390 { 390 {
391 ValidateOverwriteKeys(sim, existingSim); 391 ValidateOverwriteKeys(sim, existingSim);
392 } 392 }
393 393
394 ValidateRegionContactable(sim); 394 ValidateRegionContactable(sim);
395 } 395 }
396 catch (LoginException e) 396 catch (LoginException e)
397 { 397 {
398 m_log.WarnFormat("[LOGIN END]: {0}", e.Message); 398 m_log.WarnFormat("[LOGIN END]: {0}", e.Message);
399 399
400 return e.XmlRpcErrorResponse; 400 return e.XmlRpcErrorResponse;
401 } 401 }
402 402
@@ -489,7 +489,7 @@ namespace OpenSim.Grid.GridServer
489 responseData["allow_forceful_banlines"] = Config.AllowForcefulBanlines; 489 responseData["allow_forceful_banlines"] = Config.AllowForcefulBanlines;
490 490
491 // Instead of sending a multitude of message servers to the registering sim 491 // Instead of sending a multitude of message servers to the registering sim
492 // we should probably be sending a single one and parhaps it's backup 492 // we should probably be sending a single one and parhaps it's backup
493 // that has responsibility over routing it's messages. 493 // that has responsibility over routing it's messages.
494 494
495 // The Sim won't be contacting us again about any of the message server stuff during it's time up. 495 // The Sim won't be contacting us again about any of the message server stuff during it's time up.
@@ -583,7 +583,7 @@ namespace OpenSim.Grid.GridServer
583 583
584 sim.regionRecvKey = String.Empty; 584 sim.regionRecvKey = String.Empty;
585 sim.regionSendKey = String.Empty; 585 sim.regionSendKey = String.Empty;
586 586
587 if (requestData.ContainsKey("region_secret")) 587 if (requestData.ContainsKey("region_secret"))
588 { 588 {
589 string regionsecret = (string)requestData["region_secret"]; 589 string regionsecret = (string)requestData["region_secret"];
@@ -596,8 +596,8 @@ namespace OpenSim.Grid.GridServer
596 else 596 else
597 { 597 {
598 sim.regionSecret = Config.SimRecvKey; 598 sim.regionSecret = Config.SimRecvKey;
599 } 599 }
600 600
601 sim.regionDataURI = String.Empty; 601 sim.regionDataURI = String.Empty;
602 sim.regionAssetURI = Config.DefaultAssetServer; 602 sim.regionAssetURI = Config.DefaultAssetServer;
603 sim.regionAssetRecvKey = Config.AssetRecvKey; 603 sim.regionAssetRecvKey = Config.AssetRecvKey;
@@ -626,7 +626,7 @@ namespace OpenSim.Grid.GridServer
626 // not at all. Current strategy is to put the code in place to support the validity of this information 626 // not at all. Current strategy is to put the code in place to support the validity of this information
627 // and to roll forward debugging any issues from that point 627 // and to roll forward debugging any issues from that point
628 // 628 //
629 // this particular section of the mod attempts to receive a value from the region's xml file by way of 629 // this particular section of the mod attempts to receive a value from the region's xml file by way of
630 // OSG1GridServices for the region's owner 630 // OSG1GridServices for the region's owner
631 sim.owner_uuid = (string)requestData["master_avatar_uuid"]; 631 sim.owner_uuid = (string)requestData["master_avatar_uuid"];
632 632
@@ -1120,7 +1120,7 @@ namespace OpenSim.Grid.GridServer
1120 return response; 1120 return response;
1121 } 1121 }
1122 } 1122 }
1123 1123
1124 /// <summary> 1124 /// <summary>
1125 /// Exception generated when a simulator fails to login to the grid 1125 /// Exception generated when a simulator fails to login to the grid
1126 /// </summary> 1126 /// </summary>
@@ -1147,6 +1147,6 @@ namespace OpenSim.Grid.GridServer
1147 { 1147 {
1148 // FIXME: Might be neater to refactor and put the method inside here 1148 // FIXME: Might be neater to refactor and put the method inside here
1149 m_xmlRpcErrorResponse = GridManager.ErrorResponse(xmlRpcMessage); 1149 m_xmlRpcErrorResponse = GridManager.ErrorResponse(xmlRpcMessage);
1150 } 1150 }
1151 } 1151 }
1152} 1152}
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs
index fbadfce..47273a2 100644
--- a/OpenSim/Grid/GridServer/IGridPlugin.cs
+++ b/OpenSim/Grid/GridServer/IGridPlugin.cs
@@ -23,7 +23,7 @@
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using Mono.Addins; 29using Mono.Addins;
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 1468edd..67cff8f 100644
--- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 80f0c5e..5388263 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.InventoryServer
43 /// </summary> 43 /// </summary>
44 public class GridInventoryService : InventoryServiceBase 44 public class GridInventoryService : InventoryServiceBase
45 { 45 {
46 private static readonly ILog m_log 46 private static readonly ILog m_log
47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 49 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
@@ -56,31 +56,31 @@ namespace OpenSim.Grid.InventoryServer
56 /// <param name="rawUserID"></param> 56 /// <param name="rawUserID"></param>
57 /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns> 57 /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns>
58 public InventoryCollection GetUserInventory(Guid rawUserID) 58 public InventoryCollection GetUserInventory(Guid rawUserID)
59 { 59 {
60 LLUUID userID = new LLUUID(rawUserID); 60 LLUUID userID = new LLUUID(rawUserID);
61 61
62 m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); 62 m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);
63 63
64 // Uncomment me to simulate a slow responding inventory server 64 // Uncomment me to simulate a slow responding inventory server
65 //Thread.Sleep(16000); 65 //Thread.Sleep(16000);
66 66
67 InventoryCollection invCollection = new InventoryCollection(); 67 InventoryCollection invCollection = new InventoryCollection();
68 68
69 List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID); 69 List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID);
70 70
71 if (null == allFolders) 71 if (null == allFolders)
72 { 72 {
73 m_log.WarnFormat("[GRID AGENT INVENTORY]: No inventory found for user {0}", rawUserID); 73 m_log.WarnFormat("[GRID AGENT INVENTORY]: No inventory found for user {0}", rawUserID);
74 74
75 return invCollection; 75 return invCollection;
76 } 76 }
77 77
78 List<InventoryItemBase> allItems = new List<InventoryItemBase>(); 78 List<InventoryItemBase> allItems = new List<InventoryItemBase>();
79 79
80 foreach (InventoryFolderBase folder in allFolders) 80 foreach (InventoryFolderBase folder in allFolders)
81 { 81 {
82 List<InventoryItemBase> items = RequestFolderItems(folder.ID); 82 List<InventoryItemBase> items = RequestFolderItems(folder.ID);
83 83
84 if (items != null) 84 if (items != null)
85 { 85 {
86 allItems.InsertRange(0, items); 86 allItems.InsertRange(0, items);
@@ -88,36 +88,36 @@ namespace OpenSim.Grid.InventoryServer
88 } 88 }
89 89
90 invCollection.UserID = userID; 90 invCollection.UserID = userID;
91 invCollection.Folders = allFolders; 91 invCollection.Folders = allFolders;
92 invCollection.Items = allItems; 92 invCollection.Items = allItems;
93 93
94// foreach (InventoryFolderBase folder in invCollection.Folders) 94// foreach (InventoryFolderBase folder in invCollection.Folders)
95// { 95// {
96// m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back folder {0} {1}", folder.Name, folder.ID); 96// m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back folder {0} {1}", folder.Name, folder.ID);
97// } 97// }
98// 98//
99// foreach (InventoryItemBase item in invCollection.Items) 99// foreach (InventoryItemBase item in invCollection.Items)
100// { 100// {
101// m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back item {0} {1}, folder {2}", item.Name, item.ID, item.Folder); 101// m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back item {0} {1}, folder {2}", item.Name, item.ID, item.Folder);
102// } 102// }
103 103
104 m_log.InfoFormat( 104 m_log.InfoFormat(
105 "[GRID AGENT INVENTORY]: Sending back inventory response to user {0} containing {1} folders and {2} items", 105 "[GRID AGENT INVENTORY]: Sending back inventory response to user {0} containing {1} folders and {2} items",
106 invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count); 106 invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count);
107 107
108 return invCollection; 108 return invCollection;
109 } 109 }
110 110
111 /// <summary> 111 /// <summary>
112 /// Guid to UUID wrapper for same name IInventoryServices method 112 /// Guid to UUID wrapper for same name IInventoryServices method
113 /// </summary> 113 /// </summary>
114 /// <param name="rawUserID"></param> 114 /// <param name="rawUserID"></param>
115 /// <returns></returns> 115 /// <returns></returns>
116 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) 116 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
117 { 117 {
118 LLUUID userID = new LLUUID(rawUserID); 118 LLUUID userID = new LLUUID(rawUserID);
119 return GetInventorySkeleton(userID); 119 return GetInventorySkeleton(userID);
120 } 120 }
121 121
122 /// <summary> 122 /// <summary>
123 /// Create an inventory for the given user. 123 /// Create an inventory for the given user.
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 2279191..b7c46c2 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.InventoryServer
41 public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback 41 public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 private InventoryConfig m_config; 45 private InventoryConfig m_config;
46 private GridInventoryService m_inventoryService; 46 private GridInventoryService m_inventoryService;
47 47
@@ -73,7 +73,7 @@ namespace OpenSim.Grid.InventoryServer
73 m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); 73 m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
74 74
75 m_log.Info("[" + LogName + "]: Starting HTTP server ..."); 75 m_log.Info("[" + LogName + "]: Starting HTTP server ...");
76 76
77 m_httpServer = new BaseHttpServer(m_config.HttpPort); 77 m_httpServer = new BaseHttpServer(m_config.HttpPort);
78 AddHttpHandlers(); 78 AddHttpHandlers();
79 m_httpServer.Start(); 79 m_httpServer.Start();
@@ -86,11 +86,11 @@ namespace OpenSim.Grid.InventoryServer
86 m_httpServer.AddStreamHandler( 86 m_httpServer.AddStreamHandler(
87 new RestDeserialisehandler<Guid, InventoryCollection>( 87 new RestDeserialisehandler<Guid, InventoryCollection>(
88 "POST", "/GetInventory/", m_inventoryService.GetUserInventory)); 88 "POST", "/GetInventory/", m_inventoryService.GetUserInventory));
89 89
90 m_httpServer.AddStreamHandler( 90 m_httpServer.AddStreamHandler(
91 new RestDeserialisehandler<Guid, bool>( 91 new RestDeserialisehandler<Guid, bool>(
92 "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory)); 92 "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
93 93
94 m_httpServer.AddStreamHandler( 94 m_httpServer.AddStreamHandler(
95 new RestDeserialisehandler<InventoryFolderBase, bool>( 95 new RestDeserialisehandler<InventoryFolderBase, bool>(
96 "POST", "/NewFolder/", m_inventoryService.AddFolder)); 96 "POST", "/NewFolder/", m_inventoryService.AddFolder));
@@ -98,15 +98,15 @@ namespace OpenSim.Grid.InventoryServer
98 m_httpServer.AddStreamHandler( 98 m_httpServer.AddStreamHandler(
99 new RestDeserialisehandler<InventoryFolderBase, bool>( 99 new RestDeserialisehandler<InventoryFolderBase, bool>(
100 "POST", "/MoveFolder/", m_inventoryService.MoveFolder)); 100 "POST", "/MoveFolder/", m_inventoryService.MoveFolder));
101 101
102 m_httpServer.AddStreamHandler( 102 m_httpServer.AddStreamHandler(
103 new RestDeserialisehandler<InventoryFolderBase, bool>( 103 new RestDeserialisehandler<InventoryFolderBase, bool>(
104 "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder)); 104 "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder));
105 105
106 m_httpServer.AddStreamHandler( 106 m_httpServer.AddStreamHandler(
107 new RestDeserialisehandler<InventoryItemBase, bool>( 107 new RestDeserialisehandler<InventoryItemBase, bool>(
108 "POST", "/NewItem/", m_inventoryService.AddItem)); 108 "POST", "/NewItem/", m_inventoryService.AddItem));
109 109
110 m_httpServer.AddStreamHandler( 110 m_httpServer.AddStreamHandler(
111 new RestDeserialisehandler<InventoryItemBase, bool>( 111 new RestDeserialisehandler<InventoryItemBase, bool>(
112 "POST", "/DeleteItem/", m_inventoryService.DeleteItem)); 112 "POST", "/DeleteItem/", m_inventoryService.DeleteItem));
@@ -134,7 +134,7 @@ namespace OpenSim.Grid.InventoryServer
134 public override void RunCmd(string cmd, string[] cmdparams) 134 public override void RunCmd(string cmd, string[] cmdparams)
135 { 135 {
136 base.RunCmd(cmd, cmdparams); 136 base.RunCmd(cmd, cmdparams);
137 137
138 switch (cmd) 138 switch (cmd)
139 { 139 {
140 case "add-user": 140 case "add-user":
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
index aff4719..06e2f8a 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
@@ -82,11 +82,11 @@ namespace OpenSim.Framework.Utilities
82 /// Convert a variable length field (byte array) to a string, with a 82 /// Convert a variable length field (byte array) to a string, with a
83 /// field name prepended to each line of the output 83 /// field name prepended to each line of the output
84 /// </summary> 84 /// </summary>
85 /// <remarks>If the byte array has unprintable characters in it, a 85 /// <remarks>If the byte array has unprintable characters in it, a
86 /// hex dump will be put in the string instead</remarks> 86 /// hex dump will be put in the string instead</remarks>
87 /// <param name="bytes">The byte array to convert to a string</param> 87 /// <param name="bytes">The byte array to convert to a string</param>
88 /// <param name="fieldName">A field name to prepend to each line of output</param> 88 /// <param name="fieldName">A field name to prepend to each line of output</param>
89 /// <returns>An ASCII string or a string containing a hex dump, minus 89 /// <returns>An ASCII string or a string containing a hex dump, minus
90 /// the null terminator</returns> 90 /// the null terminator</returns>
91 public static string FieldToString(byte[] bytes, string fieldName) 91 public static string FieldToString(byte[] bytes, string fieldName)
92 { 92 {
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
index a5a4ec8..27f0d8a 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
@@ -29,8 +29,8 @@
29// <autogenerated> 29// <autogenerated>
30// This code was generated by a tool. 30// This code was generated by a tool.
31// Mono Runtime Version: 2.0.50727.42 31// Mono Runtime Version: 2.0.50727.42
32// 32//
33// Changes to this file may cause incorrect behavior and will be lost if 33// Changes to this file may cause incorrect behavior and will be lost if
34// the code is regenerated. 34// the code is regenerated.
35// </autogenerated> 35// </autogenerated>
36// ------------------------------------------------------------------------------ 36// ------------------------------------------------------------------------------
@@ -52,7 +52,7 @@ namespace OpenGridServices.Manager
52 private Gtk.Entry entry3; 52 private Gtk.Entry entry3;
53 private Gtk.Button button2; 53 private Gtk.Button button2;
54 private Gtk.Button button8; 54 private Gtk.Button button8;
55 55
56 protected virtual void Build() 56 protected virtual void Build()
57 { 57 {
58 Stetic.Gui.Initialize(); 58 Stetic.Gui.Initialize();
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
index 9707aee..068b9c6 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
@@ -29,8 +29,8 @@
29// <autogenerated> 29// <autogenerated>
30// This code was generated by a tool. 30// This code was generated by a tool.
31// Mono Runtime Version: 2.0.50727.42 31// Mono Runtime Version: 2.0.50727.42
32// 32//
33// Changes to this file may cause incorrect behavior and will be lost if 33// Changes to this file may cause incorrect behavior and will be lost if
34// the code is regenerated. 34// the code is regenerated.
35// </autogenerated> 35// </autogenerated>
36// ------------------------------------------------------------------------------ 36// ------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ namespace OpenGridServices.Manager
74 private Gtk.DrawingArea drawingarea1; 74 private Gtk.DrawingArea drawingarea1;
75 private Gtk.TreeView treeview1; 75 private Gtk.TreeView treeview1;
76 private Gtk.Statusbar statusbar1; 76 private Gtk.Statusbar statusbar1;
77 77
78 protected virtual void Build() 78 protected virtual void Build()
79 { 79 {
80 Stetic.Gui.Initialize(); 80 Stetic.Gui.Initialize();
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
index 46dec05..b5fd3f7 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
@@ -29,8 +29,8 @@
29// <autogenerated> 29// <autogenerated>
30// This code was generated by a tool. 30// This code was generated by a tool.
31// Mono Runtime Version: 2.0.50727.42 31// Mono Runtime Version: 2.0.50727.42
32// 32//
33// Changes to this file may cause incorrect behavior and will be lost if 33// Changes to this file may cause incorrect behavior and will be lost if
34// the code is regenerated. 34// the code is regenerated.
35// </autogenerated> 35// </autogenerated>
36// ------------------------------------------------------------------------------ 36// ------------------------------------------------------------------------------
@@ -40,20 +40,20 @@ namespace Stetic
40 internal class Gui 40 internal class Gui
41 { 41 {
42 private static bool initialized; 42 private static bool initialized;
43 43
44 internal static void Initialize() 44 internal static void Initialize()
45 { 45 {
46 Stetic.Gui.initialized = true; 46 Stetic.Gui.initialized = true;
47 } 47 }
48 } 48 }
49 49
50 internal class ActionGroups 50 internal class ActionGroups
51 { 51 {
52 public static Gtk.ActionGroup GetActionGroup(System.Type type) 52 public static Gtk.ActionGroup GetActionGroup(System.Type type)
53 { 53 {
54 return Stetic.ActionGroups.GetActionGroup(type.FullName); 54 return Stetic.ActionGroups.GetActionGroup(type.FullName);
55 } 55 }
56 56
57 public static Gtk.ActionGroup GetActionGroup(string name) 57 public static Gtk.ActionGroup GetActionGroup(string name)
58 { 58 {
59 return null; 59 return null;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 9020ca4..7e9456d 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Grid.MessagingServer
45 45
46 private MessageServerConfig Cfg; 46 private MessageServerConfig Cfg;
47 private MessageService msgsvc; 47 private MessageService msgsvc;
48 48
49 private LLUUID m_lastCreatedUser = LLUUID.Random(); 49 private LLUUID m_lastCreatedUser = LLUUID.Random();
50 50
51 [STAThread] 51 [STAThread]
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.MessagingServer
55 55
56 m_log.Info("Launching MessagingServer..."); 56 m_log.Info("Launching MessagingServer...");
57 57
58 58
59 59
60 OpenMessage_Main messageserver = new OpenMessage_Main(); 60 OpenMessage_Main messageserver = new OpenMessage_Main();
61 61
@@ -118,7 +118,7 @@ namespace OpenSim.Grid.MessagingServer
118 switch (what) 118 switch (what)
119 { 119 {
120 case "user": 120 case "user":
121 121
122 try 122 try
123 { 123 {
124 //userID = 124 //userID =
@@ -140,12 +140,12 @@ namespace OpenSim.Grid.MessagingServer
140 // m_lastCreatedUser = userID; 140 // m_lastCreatedUser = userID;
141 break; 141 break;
142 } 142 }
143 } 143 }
144 144
145 public override void Shutdown() 145 public override void Shutdown()
146 { 146 {
147 msgsvc.deregisterWithUserServer(); 147 msgsvc.deregisterWithUserServer();
148 148
149 base.Shutdown(); 149 base.Shutdown();
150 } 150 }
151 } 151 }
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index f9f3669..e1beef1 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -63,13 +63,13 @@ namespace OpenSim.Grid.MessagingServer
63 { 63 {
64 m_cfg = cfg; 64 m_cfg = cfg;
65 } 65 }
66 66
67 #region RegionComms Methods 67 #region RegionComms Methods
68 68
69 #endregion 69 #endregion
70 70
71 #region FriendList Methods 71 #region FriendList Methods
72 72
73 /// <summary> 73 /// <summary>
74 /// Process Friendlist subscriptions for a user 74 /// Process Friendlist subscriptions for a user
75 /// The login method calls this for a User 75 /// The login method calls this for a User
@@ -93,7 +93,7 @@ namespace OpenSim.Grid.MessagingServer
93 { 93 {
94 UserPresenceData friendup = (UserPresenceData)m_presences[uFriendList[i].Friend]; 94 UserPresenceData friendup = (UserPresenceData)m_presences[uFriendList[i].Friend];
95 // Add backreference 95 // Add backreference
96 96
97 SubscribeToPresenceUpdates(userpresence, friendup, uFriendList[i],i); 97 SubscribeToPresenceUpdates(userpresence, friendup, uFriendList[i],i);
98 } 98 }
99 } 99 }
@@ -101,14 +101,14 @@ namespace OpenSim.Grid.MessagingServer
101 101
102 /// <summary> 102 /// <summary>
103 /// Does the necessary work to subscribe one agent to another's presence notifications 103 /// Does the necessary work to subscribe one agent to another's presence notifications
104 /// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly 104 /// Gets called by ProcessFriendListSubscriptions. You shouldn't call this directly
105 /// unless you know what you're doing 105 /// unless you know what you're doing
106 /// </summary> 106 /// </summary>
107 /// <param name="userpresence">P1</param> 107 /// <param name="userpresence">P1</param>
108 /// <param name="friendpresence">P2</param> 108 /// <param name="friendpresence">P2</param>
109 /// <param name="uFriendListItem"></param> 109 /// <param name="uFriendListItem"></param>
110 /// <param name="uFriendListIndex"></param> 110 /// <param name="uFriendListIndex"></param>
111 public void SubscribeToPresenceUpdates(UserPresenceData userpresence, UserPresenceData friendpresence, 111 public void SubscribeToPresenceUpdates(UserPresenceData userpresence, UserPresenceData friendpresence,
112 FriendListItem uFriendListItem, int uFriendListIndex) 112 FriendListItem uFriendListItem, int uFriendListIndex)
113 { 113 {
114 if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0) 114 if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)
@@ -117,7 +117,7 @@ namespace OpenSim.Grid.MessagingServer
117 if (!friendpresence.subscriptionData.Contains(friendpresence.agentData.AgentID)) 117 if (!friendpresence.subscriptionData.Contains(friendpresence.agentData.AgentID))
118 { 118 {
119 userpresence.subscriptionData.Add(friendpresence.agentData.AgentID); 119 userpresence.subscriptionData.Add(friendpresence.agentData.AgentID);
120 //Send Region Notice.... 120 //Send Region Notice....
121 } 121 }
122 else 122 else
123 { 123 {
@@ -149,13 +149,13 @@ namespace OpenSim.Grid.MessagingServer
149 149
150 WaitCallback cb2 = new WaitCallback(friendlistupdater.go); 150 WaitCallback cb2 = new WaitCallback(friendlistupdater.go);
151 ThreadPool.QueueUserWorkItem(cb2); 151 ThreadPool.QueueUserWorkItem(cb2);
152 152
153 //SendRegionPresenceUpdate(userpresence, friendpresence); 153 //SendRegionPresenceUpdate(userpresence, friendpresence);
154 } 154 }
155 } 155 }
156 156
157 /// <summary> 157 /// <summary>
158 /// Adds a backreference so presence specific data doesn't have to be 158 /// Adds a backreference so presence specific data doesn't have to be
159 /// enumerated for each logged in user every time someone logs on or off. 159 /// enumerated for each logged in user every time someone logs on or off.
160 /// </summary> 160 /// </summary>
161 /// <param name="agentID"></param> 161 /// <param name="agentID"></param>
@@ -194,7 +194,7 @@ namespace OpenSim.Grid.MessagingServer
194 presenseBackReferences.Remove(agentID); 194 presenseBackReferences.Remove(agentID);
195 } 195 }
196 196
197 // If there are no more backreferences for this agent, 197 // If there are no more backreferences for this agent,
198 // remove it to free up memory. 198 // remove it to free up memory.
199 if (presenseBackReferences.Count == 0) 199 if (presenseBackReferences.Count == 0)
200 { 200 {
@@ -276,7 +276,7 @@ namespace OpenSim.Grid.MessagingServer
276 } 276 }
277 } 277 }
278 } 278 }
279 279
280 #endregion 280 #endregion
281 281
282 #region UserServer Comms 282 #region UserServer Comms
@@ -342,7 +342,7 @@ namespace OpenSim.Grid.MessagingServer
342 342
343 /// <summary> 343 /// <summary>
344 /// UserServer sends an expect_user method 344 /// UserServer sends an expect_user method
345 /// this handles the method and provisions the 345 /// this handles the method and provisions the
346 /// necessary info for presence to work 346 /// necessary info for presence to work
347 /// </summary> 347 /// </summary>
348 /// <param name="request">UserServer Data</param> 348 /// <param name="request">UserServer Data</param>
@@ -398,9 +398,9 @@ namespace OpenSim.Grid.MessagingServer
398 398
399 return new XmlRpcResponse(); 399 return new XmlRpcResponse();
400 } 400 }
401 401
402 /// <summary> 402 /// <summary>
403 /// The UserServer got a Logoff message 403 /// The UserServer got a Logoff message
404 /// Cleanup time for that user. Send out presence notifications 404 /// Cleanup time for that user. Send out presence notifications
405 /// </summary> 405 /// </summary>
406 /// <param name="request"></param> 406 /// <param name="request"></param>
@@ -408,7 +408,7 @@ namespace OpenSim.Grid.MessagingServer
408 public XmlRpcResponse UserLoggedOff(XmlRpcRequest request) 408 public XmlRpcResponse UserLoggedOff(XmlRpcRequest request)
409 { 409 {
410 Hashtable requestData = (Hashtable)request.Params[0]; 410 Hashtable requestData = (Hashtable)request.Params[0];
411 411
412 LLUUID AgentID = new LLUUID((string)requestData["agentid"]); 412 LLUUID AgentID = new LLUUID((string)requestData["agentid"]);
413 413
414 ProcessLogOff(AgentID); 414 ProcessLogOff(AgentID);
@@ -433,7 +433,7 @@ namespace OpenSim.Grid.MessagingServer
433 { 433 {
434 regionInfo = (RegionProfileData)m_regionInfoCache[regionhandle]; 434 regionInfo = (RegionProfileData)m_regionInfoCache[regionhandle];
435 } 435 }
436 else 436 else
437 { 437 {
438 regionInfo = RequestRegionInfo(regionhandle); 438 regionInfo = RequestRegionInfo(regionhandle);
439 } 439 }
@@ -457,7 +457,7 @@ namespace OpenSim.Grid.MessagingServer
457 SendParams.Add(requestData); 457 SendParams.Add(requestData);
458 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); 458 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
459 XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000); 459 XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);
460 460
461 Hashtable responseData = (Hashtable)GridResp.Value; 461 Hashtable responseData = (Hashtable)GridResp.Value;
462 462
463 if (responseData.ContainsKey("error")) 463 if (responseData.ContainsKey("error"))
@@ -479,7 +479,7 @@ namespace OpenSim.Grid.MessagingServer
479 regionProfile.regionHandle = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); 479 regionProfile.regionHandle = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
480 regionProfile.regionLocX = regX; 480 regionProfile.regionLocX = regX;
481 regionProfile.regionLocY = regY; 481 regionProfile.regionLocY = regY;
482 482
483 regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); 483 regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
484 regionProfile.UUID = new LLUUID((string)responseData["region_UUID"]); 484 regionProfile.UUID = new LLUUID((string)responseData["region_UUID"]);
485 regionProfile.regionName = (string)responseData["region_name"]; 485 regionProfile.regionName = (string)responseData["region_name"];
@@ -498,7 +498,7 @@ namespace OpenSim.Grid.MessagingServer
498 " - Is the GridServer down?"); 498 " - Is the GridServer down?");
499 return null; 499 return null;
500 } 500 }
501 501
502 return regionProfile; 502 return regionProfile;
503 } 503 }
504 504
@@ -506,19 +506,19 @@ namespace OpenSim.Grid.MessagingServer
506 { 506 {
507 Hashtable UserParams = new Hashtable(); 507 Hashtable UserParams = new Hashtable();
508 // Login / Authentication 508 // Login / Authentication
509 509
510 if (m_cfg.HttpSSL) 510 if (m_cfg.HttpSSL)
511 { 511 {
512 UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; 512 UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
513 } 513 }
514 else 514 else
515 { 515 {
516 UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; 516 UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
517 } 517 }
518 518
519 UserParams["recvkey"] = m_cfg.UserRecvKey; 519 UserParams["recvkey"] = m_cfg.UserRecvKey;
520 UserParams["sendkey"] = m_cfg.UserRecvKey; 520 UserParams["sendkey"] = m_cfg.UserRecvKey;
521 521
522 // Package into an XMLRPC Request 522 // Package into an XMLRPC Request
523 ArrayList SendParams = new ArrayList(); 523 ArrayList SendParams = new ArrayList();
524 SendParams.Add(UserParams); 524 SendParams.Add(UserParams);
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index df3bc22..a0aeacc 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -48,9 +48,9 @@ namespace OpenSim.Grid.MessagingServer
48 : base("GET", "/presence") 48 : base("GET", "/presence")
49 { 49 {
50 m_log.Info("[REST]: In Get Request"); 50 m_log.Info("[REST]: In Get Request");
51 51
52 } 52 }
53 53
54 public override byte[] Handle(string path, Stream request) 54 public override byte[] Handle(string path, Stream request)
55 { 55 {
56 string param = GetParam(path); 56 string param = GetParam(path);
@@ -61,8 +61,8 @@ namespace OpenSim.Grid.MessagingServer
61 61
62 if (p.Length > 0) 62 if (p.Length > 0)
63 { 63 {
64 LLUUID assetID = null; 64 LLUUID assetID = null;
65 65
66 if (!LLUUID.TryParse(p[0], out assetID)) 66 if (!LLUUID.TryParse(p[0], out assetID))
67 { 67 {
68 m_log.InfoFormat( 68 m_log.InfoFormat(
@@ -101,7 +101,7 @@ namespace OpenSim.Grid.MessagingServer
101 public PostXMPPStreamHandler() 101 public PostXMPPStreamHandler()
102 : base("POST", "/presence") 102 : base("POST", "/presence")
103 { 103 {
104 104
105 } 105 }
106 106
107 } 107 }
diff --git a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
index 3d06232..d18822c 100644
--- a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 072c86c..639cd54 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
165 // if level == 0, add to return 165 // if level == 0, add to return
166 if (ilevel == 1 && lastlevel == 0) 166 if (ilevel == 1 && lastlevel == 0)
167 { 167 {
168 // 0 => 1: Get last 168 // 0 => 1: Get last
169 Match m = 169 Match m =
170 Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{", 170 Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{",
171 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); 171 RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index f957d63..60f4d42 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -98,9 +98,9 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
98 ads.ConfigurationFile 98 ads.ConfigurationFile
99 ); 99 );
100 100
101 // Display the name of the calling AppDomain and the name 101 // Display the name of the calling AppDomain and the name
102 // of the second domain. 102 // of the second domain.
103 // NOTE: The application's thread has transitioned between 103 // NOTE: The application's thread has transitioned between
104 // AppDomains. 104 // AppDomains.
105 Console.WriteLine("Calling to '{0}'.", 105 Console.WriteLine("Calling to '{0}'.",
106 Thread.GetDomain().FriendlyName 106 Thread.GetDomain().FriendlyName
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
index 4ec8618..f7c8fb1 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
167 Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); 167 Common.SendToDebug("IL_CREATE_CONSTRUCTOR()");
168 //ConstructorBuilder constructor = typeBuilder.DefineConstructor( 168 //ConstructorBuilder constructor = typeBuilder.DefineConstructor(
169 // MethodAttributes.Public, 169 // MethodAttributes.Public,
170 // CallingConventions.Standard, 170 // CallingConventions.Standard,
171 // new Type[0]); 171 // new Type[0]);
172 ConstructorBuilder constructor = typeBuilder.DefineConstructor( 172 ConstructorBuilder constructor = typeBuilder.DefineConstructor(
173 MethodAttributes.Public | 173 MethodAttributes.Public |
@@ -191,8 +191,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
191 //// Create state object 191 //// Create state object
192 //FieldName = "State"; 192 //FieldName = "State";
193 //FieldBuilder State_fb = typeBuilder.DefineField( 193 //FieldBuilder State_fb = typeBuilder.DefineField(
194 // FieldName, 194 // FieldName,
195 // typeof(UInt32), 195 // typeof(UInt32),
196 // FieldAttributes.Public); 196 // FieldAttributes.Public);
197 //il.Emit(OpCodes.Ldarg_0); 197 //il.Emit(OpCodes.Ldarg_0);
198 //il.Emit(OpCodes.Ldc_I4, 0); 198 //il.Emit(OpCodes.Ldc_I4, 0);
@@ -205,8 +205,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
205 205
206 //FieldName = "LSL_BuiltIns"; 206 //FieldName = "LSL_BuiltIns";
207 //FieldBuilder LSL_BuiltIns_fb = typeBuilder.DefineField( 207 //FieldBuilder LSL_BuiltIns_fb = typeBuilder.DefineField(
208 // FieldName, 208 // FieldName,
209 // objType1, 209 // objType1,
210 // FieldAttributes.Public); 210 // FieldAttributes.Public);
211 211
212 ////LSL_BuiltIn_Commands_TestImplementation _ti = new LSL_BuiltIn_Commands_TestImplementation(); 212 ////LSL_BuiltIn_Commands_TestImplementation _ti = new LSL_BuiltIn_Commands_TestImplementation();
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs
index 05f7611..11b567e 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs
@@ -36,9 +36,9 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
36 * 36 *
37 * These are internal "assembly" commands, 37 * These are internal "assembly" commands,
38 * basic operators like "ADD", "PUSH" and "POP" 38 * basic operators like "ADD", "PUSH" and "POP"
39 * 39 *
40 * It also contains managed stack and keeps track of internal variables, etc. 40 * It also contains managed stack and keeps track of internal variables, etc.
41 * 41 *
42 */ 42 */
43 43
44 44
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs
index 9189bf6..25d1211 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
75 /// </summary> 75 /// </summary>
76 public void Parse() 76 public void Parse()
77 { 77 {
78 // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. 78 // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack.
79 79
80 80
81 // HEADER BLOCK 81 // HEADER BLOCK
@@ -295,7 +295,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
295 myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount]; 295 myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount];
296 for (int i = 0; i < myStateFrameBlock.StateCount; i++) 296 for (int i = 0; i < myStateFrameBlock.StateCount; i++)
297 { 297 {
298 // TODO: Somehow organize events and functions so they can be found again, 298 // TODO: Somehow organize events and functions so they can be found again,
299 // two level search ain't no good 299 // two level search ain't no good
300 for (int ii = 0; ii < myStateFrameBlock.StatePointer[i].EventMask.Count - 1; ii++) 300 for (int ii = 0; ii < myStateFrameBlock.StatePointer[i].EventMask.Count - 1; ii++)
301 { 301 {
@@ -373,7 +373,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
373 373
374 //private byte[] br_read_smallendian(int len) 374 //private byte[] br_read_smallendian(int len)
375 //{ 375 //{
376 // byte[] bytes = new byte[len]; 376 // byte[] bytes = new byte[len];
377 // br.Read(bytes,0, len); 377 // br.Read(bytes,0, len);
378 // return bytes; 378 // return bytes;
379 //} 379 //}
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
index d724d22..0d2d7cf 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
67 public void OnRezScript(uint localID, LLUUID itemID, string script) 67 public void OnRezScript(uint localID, LLUUID itemID, string script)
68 { 68 {
69 //myScriptEngine.myScriptManager.StartScript( 69 //myScriptEngine.myScriptManager.StartScript(
70 // Path.Combine("ScriptEngines", "Default.lsl"), 70 // Path.Combine("ScriptEngines", "Default.lsl"),
71 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() 71 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()
72 //); 72 //);
73 Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + 73 Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " +
@@ -78,7 +78,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
78 public void OnRemoveScript(uint localID, LLUUID itemID) 78 public void OnRemoveScript(uint localID, LLUUID itemID)
79 { 79 {
80 //myScriptEngine.myScriptManager.StartScript( 80 //myScriptEngine.myScriptManager.StartScript(
81 // Path.Combine("ScriptEngines", "Default.lsl"), 81 // Path.Combine("ScriptEngines", "Default.lsl"),
82 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() 82 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()
83 //); 83 //);
84 Console.WriteLine("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString()); 84 Console.WriteLine("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString());
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
index 351f26b..060ae0b 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,11 +54,11 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
61// You can specify all the values or you can default the Revision and Build Numbers 61// You can specify all the values or you can default the Revision and Build Numbers
62// by using the '*' as shown below: 62// by using the '*' as shown below:
63 63
64[assembly : AssemblyVersion("1.0.0.0")] 64[assembly : AssemblyVersion("1.0.0.0")]
diff --git a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
index e4161d3..0ec6d6c 100644
--- a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 00b7f76..79524b4 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -48,10 +48,10 @@ namespace OpenSim.Grid.UserServer
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 49
50 private UserConfig Cfg; 50 private UserConfig Cfg;
51 51
52 public UserManager m_userManager; 52 public UserManager m_userManager;
53 public UserLoginService m_loginService; 53 public UserLoginService m_loginService;
54 public MessageServersConnector m_messagesService; 54 public MessageServersConnector m_messagesService;
55 55
56 private LLUUID m_lastCreatedUser = LLUUID.Random(); 56 private LLUUID m_lastCreatedUser = LLUUID.Random();
57 57
@@ -87,13 +87,13 @@ namespace OpenSim.Grid.UserServer
87 public void Startup() 87 public void Startup()
88 { 88 {
89 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 89 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
90 90
91 m_stats = StatsManager.StartCollectingUserStats(); 91 m_stats = StatsManager.StartCollectingUserStats();
92 92
93 m_log.Info("[REGION]: Establishing data connection"); 93 m_log.Info("[REGION]: Establishing data connection");
94 m_userManager = new UserManager(); 94 m_userManager = new UserManager();
95 m_userManager._config = Cfg; 95 m_userManager._config = Cfg;
96 m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); 96 m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
97 97
98 m_loginService = new UserLoginService( 98 m_loginService = new UserLoginService(
99 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); 99 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.UserServer
104 m_userManager.OnLogOffUser += NotifyMessageServersUserLoggOff; 104 m_userManager.OnLogOffUser += NotifyMessageServersUserLoggOff;
105 105
106 m_log.Info("[REGION]: Starting HTTP process"); 106 m_log.Info("[REGION]: Starting HTTP process");
107 107
108 m_httpServer = new BaseHttpServer(Cfg.HttpPort); 108 m_httpServer = new BaseHttpServer(Cfg.HttpPort);
109 AddHttpHandlers(); 109 AddHttpHandlers();
110 m_httpServer.Start(); 110 m_httpServer.Start();
@@ -117,7 +117,7 @@ namespace OpenSim.Grid.UserServer
117 m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); 117 m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
118 118
119 m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin); 119 m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin);
120 120
121 m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod); 121 m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
122 122
123 m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName); 123 m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
@@ -128,7 +128,7 @@ namespace OpenSim.Grid.UserServer
128 m_httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms); 128 m_httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms);
129 m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList); 129 m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList);
130 m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID); 130 m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID);
131 131
132 // Message Server ---> User Server 132 // Message Server ---> User Server
133 m_httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer); 133 m_httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer);
134 m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion); 134 m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion);
@@ -163,17 +163,17 @@ namespace OpenSim.Grid.UserServer
163 { 163 {
164 m_log.ErrorFormat( 164 m_log.ErrorFormat(
165 "[USERS]: A user with the name {0} {1} already exists!", tempfirstname, templastname); 165 "[USERS]: A user with the name {0} {1} already exists!", tempfirstname, templastname);
166 166
167 break; 167 break;
168 } 168 }
169 169
170 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); 170 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
171 171
172 LLUUID userID = new LLUUID(); 172 LLUUID userID = new LLUUID();
173 try 173 try
174 { 174 {
175 userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); 175 userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
176 } 176 }
177 catch (Exception ex) 177 catch (Exception ex)
178 { 178 {
179 m_log.ErrorFormat("[USERS]: Error creating user: {0}", ex.ToString()); 179 m_log.ErrorFormat("[USERS]: Error creating user: {0}", ex.ToString());
@@ -181,31 +181,31 @@ namespace OpenSim.Grid.UserServer
181 181
182 try 182 try
183 { 183 {
184 bool created 184 bool created
185 = SynchronousRestObjectPoster.BeginPostObject<Guid, bool>( 185 = SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
186 "POST", m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID); 186 "POST", m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID);
187 187
188 if (!created) 188 if (!created)
189 { 189 {
190 throw new Exception( 190 throw new Exception(
191 String.Format( 191 String.Format(
192 "The inventory creation request for user {0} did not succeed." 192 "The inventory creation request for user {0} did not succeed."
193 + " Please contact your inventory service provider for more information.", 193 + " Please contact your inventory service provider for more information.",
194 userID)); 194 userID));
195 } 195 }
196 196
197 } 197 }
198 catch (WebException) 198 catch (WebException)
199 { 199 {
200 m_log.ErrorFormat( 200 m_log.ErrorFormat(
201 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 201 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
202 m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID); 202 m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID);
203 } 203 }
204 catch (Exception e) 204 catch (Exception e)
205 { 205 {
206 m_log.ErrorFormat("[USERS]: Error creating inventory for user: {0}", e); 206 m_log.ErrorFormat("[USERS]: Error creating inventory for user: {0}", e);
207 } 207 }
208 208
209 m_lastCreatedUser = userID; 209 m_lastCreatedUser = userID;
210 break; 210 break;
211 } 211 }
@@ -214,7 +214,7 @@ namespace OpenSim.Grid.UserServer
214 public override void RunCmd(string cmd, string[] cmdparams) 214 public override void RunCmd(string cmd, string[] cmdparams)
215 { 215 {
216 base.RunCmd(cmd, cmdparams); 216 base.RunCmd(cmd, cmdparams);
217 217
218 switch (cmd) 218 switch (cmd)
219 { 219 {
220 case "help": 220 case "help":
@@ -223,7 +223,7 @@ namespace OpenSim.Grid.UserServer
223 223
224 case "create": 224 case "create":
225 do_create(cmdparams[0]); 225 do_create(cmdparams[0]);
226 break; 226 break;
227 227
228 case "test-inventory": 228 case "test-inventory":
229 // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); 229 // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
@@ -242,10 +242,10 @@ namespace OpenSim.Grid.UserServer
242 public override void Shutdown() 242 public override void Shutdown()
243 { 243 {
244 m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation; 244 m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
245 245
246 base.Shutdown(); 246 base.Shutdown();
247 } 247 }
248 248
249 public void TestResponse(List<InventoryFolderBase> resp) 249 public void TestResponse(List<InventoryFolderBase> resp)
250 { 250 {
251 m_console.Notice("response got"); 251 m_console.Notice("response got");
@@ -257,10 +257,10 @@ namespace OpenSim.Grid.UserServer
257 } 257 }
258 258
259 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 259 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
260 ulong regionhandle, float positionX, float positionY, 260 ulong regionhandle, float positionX, float positionY,
261 float positionZ, string firstname, string lastname) 261 float positionZ, string firstname, string lastname)
262 { 262 {
263 263
264 m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX, 264 m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX,
265 positionY, positionZ, firstname, lastname); 265 positionY, positionZ, firstname, lastname);
266 } 266 }
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 4e9728e..529c089 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -41,12 +41,12 @@ namespace OpenSim.Grid.UserServer
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 public Dictionary<string, MessageServerInfo> MessageServers; 43 public Dictionary<string, MessageServerInfo> MessageServers;
44 44
45 public MessageServersConnector() 45 public MessageServersConnector()
46 { 46 {
47 MessageServers = new Dictionary<string, MessageServerInfo>(); 47 MessageServers = new Dictionary<string, MessageServerInfo>();
48 } 48 }
49 49
50 public void RegisterMessageServer(string URI, MessageServerInfo serverData) 50 public void RegisterMessageServer(string URI, MessageServerInfo serverData)
51 { 51 {
52 lock (MessageServers) 52 lock (MessageServers)
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.UserServer
55 MessageServers.Add(URI, serverData); 55 MessageServers.Add(URI, serverData);
56 } 56 }
57 } 57 }
58 58
59 public void DeRegisterMessageServer(string URI) 59 public void DeRegisterMessageServer(string URI)
60 { 60 {
61 lock (MessageServers) 61 lock (MessageServers)
@@ -64,7 +64,7 @@ namespace OpenSim.Grid.UserServer
64 MessageServers.Remove(URI); 64 MessageServers.Remove(URI);
65 } 65 }
66 } 66 }
67 67
68 public void AddResponsibleRegion(string URI, ulong regionhandle) 68 public void AddResponsibleRegion(string URI, ulong regionhandle)
69 { 69 {
70 if (!MessageServers.ContainsKey(URI)) 70 if (!MessageServers.ContainsKey(URI))
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.UserServer
76 MessageServerInfo msginfo = MessageServers["URI"]; 76 MessageServerInfo msginfo = MessageServers["URI"];
77 msginfo.responsibleForRegions.Add(regionhandle); 77 msginfo.responsibleForRegions.Add(regionhandle);
78 MessageServers["URI"] = msginfo; 78 MessageServers["URI"] = msginfo;
79 } 79 }
80 } 80 }
81 public void RemoveResponsibleRegion(string URI, ulong regionhandle) 81 public void RemoveResponsibleRegion(string URI, ulong regionhandle)
82 { 82 {
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
92 msginfo.responsibleForRegions.Remove(regionhandle); 92 msginfo.responsibleForRegions.Remove(regionhandle);
93 MessageServers["URI"] = msginfo; 93 MessageServers["URI"] = msginfo;
94 } 94 }
95 } 95 }
96 96
97 } 97 }
98 public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request) 98 public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request)
@@ -148,7 +148,7 @@ namespace OpenSim.Grid.UserServer
148 string scurrentpos = (string)requestData["currentpos"]; 148 string scurrentpos = (string)requestData["currentpos"];
149 //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); 149 //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
150 // TODO: Okay now raise event so the user server can pass this data to the Usermanager 150 // TODO: Okay now raise event so the user server can pass this data to the Usermanager
151 151
152 responseData["responsestring"] = "TRUE"; 152 responseData["responsestring"] = "TRUE";
153 response.Value = responseData; 153 response.Value = responseData;
154 } 154 }
@@ -156,7 +156,7 @@ namespace OpenSim.Grid.UserServer
156 } 156 }
157 157
158 public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 158 public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
159 ulong regionhandle, float positionX, float positionY, 159 ulong regionhandle, float positionX, float positionY,
160 float positionZ, string firstname, string lastname) 160 float positionZ, string firstname, string lastname)
161 { 161 {
162 // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D) 162 // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D)
@@ -218,9 +218,9 @@ namespace OpenSim.Grid.UserServer
218 m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout"); 218 m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout");
219 } 219 }
220 220
221 private void NotifyMessageServerAboutUser(MessageServerInfo serv, 221 private void NotifyMessageServerAboutUser(MessageServerInfo serv,
222 LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 222 LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
223 ulong regionhandle, float positionX, float positionY, float positionZ, 223 ulong regionhandle, float positionX, float positionY, float positionZ,
224 string firstname, string lastname) 224 string firstname, string lastname)
225 { 225 {
226 Hashtable reqparams = new Hashtable(); 226 Hashtable reqparams = new Hashtable();
@@ -250,7 +250,7 @@ namespace OpenSim.Grid.UserServer
250 { 250 {
251 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user"); 251 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login. Presence might be borked for this user");
252 } 252 }
253 253
254 } 254 }
255 } 255 }
256} 256}
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 680b357..926f680 100644
--- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
28using System.Reflection; 28using System.Reflection;
29using System.Runtime.InteropServices; 29using System.Runtime.InteropServices;
30 30
31// General Information about an assembly is controlled through the following 31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
43 43
44// Setting ComVisible to false makes the types in this assembly not visible 44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from 45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type. 46// COM, set the ComVisible attribute to true on that type.
47 47
48[assembly : ComVisible(false)] 48[assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
54// Version information for an assembly consists of the following four values: 54// Version information for an assembly consists of the following four values:
55// 55//
56// Major Version 56// Major Version
57// Minor Version 57// Minor Version
58// Build Number 58// Build Number
59// Revision 59// Revision
60// 60//
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 32b1ada..3c9d650 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -50,11 +50,11 @@ namespace OpenSim.Grid.UserServer
50 public event UserLoggedInAtLocation OnUserLoggedInAtLocation; 50 public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
51 51
52 private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null; 52 private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null;
53 53
54 public UserConfig m_config; 54 public UserConfig m_config;
55 55
56 public UserLoginService( 56 public UserLoginService(
57 UserManagerBase userManager, LibraryRootFolder libraryRootFolder, 57 UserManagerBase userManager, LibraryRootFolder libraryRootFolder,
58 UserConfig config, string welcomeMess) 58 UserConfig config, string welcomeMess)
59 : base(userManager, libraryRootFolder, welcomeMess) 59 : base(userManager, libraryRootFolder, welcomeMess)
60 { 60 {
@@ -138,9 +138,9 @@ namespace OpenSim.Grid.UserServer
138 theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}"; 138 theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}";
139 139
140 // Destination 140 // Destination
141 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 141 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
142 //CFK: the next one for X & Y and comment this one. 142 //CFK: the next one for X & Y and comment this one.
143 //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + 143 //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX +
144 //CFK: "; Region Y: " + SimInfo.regionLocY); 144 //CFK: "; Region Y: " + SimInfo.regionLocY);
145 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverURI.Split(new char[] { '/', ':' })[3]).ToString(); 145 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverURI.Split(new char[] { '/', ':' })[3]).ToString();
146 response.SimPort = uint.Parse(SimInfo.serverURI.Split(new char[] { '/', ':' })[4]); 146 response.SimPort = uint.Parse(SimInfo.serverURI.Split(new char[] { '/', ':' })[4]);
@@ -150,15 +150,15 @@ namespace OpenSim.Grid.UserServer
150 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI 150 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI
151 string capsPath = Util.GetRandomCapsPath(); 151 string capsPath = Util.GetRandomCapsPath();
152 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; 152 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
153 153
154 m_log.DebugFormat( 154 m_log.DebugFormat(
155 "[LOGIN]: Sending new CAPS seed url {0} to client {1}", 155 "[LOGIN]: Sending new CAPS seed url {0} to client {1}",
156 response.SeedCapability, response.AgentID); 156 response.SeedCapability, response.AgentID);
157 157
158 // Notify the target of an incoming user 158 // Notify the target of an incoming user
159 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 159 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
160 //CFK: the next one for X & Y and comment this one. 160 //CFK: the next one for X & Y and comment this one.
161 //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ") " + 161 //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ") " +
162 //CFK: SimInfo.regionLocX + "," + SimInfo.regionLocY); 162 //CFK: SimInfo.regionLocX + "," + SimInfo.regionLocY);
163 163
164 theUser.CurrentAgent.Region = SimInfo.UUID; 164 theUser.CurrentAgent.Region = SimInfo.UUID;
@@ -187,23 +187,23 @@ namespace OpenSim.Grid.UserServer
187 // Update agent with target sim 187 // Update agent with target sim
188 188
189 m_log.InfoFormat( 189 m_log.InfoFormat(
190 "[LOGIN]: Telling region {0} @ {1},{2} ({3}) to expect user connection", 190 "[LOGIN]: Telling region {0} @ {1},{2} ({3}) to expect user connection",
191 SimInfo.regionName, response.RegionX, response.RegionY, SimInfo.httpServerURI); 191 SimInfo.regionName, response.RegionX, response.RegionY, SimInfo.httpServerURI);
192 192
193 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 193 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
194 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 194 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
195 195
196 if (GridResp.IsFault) 196 if (GridResp.IsFault)
197 { 197 {
198 m_log.ErrorFormat( 198 m_log.ErrorFormat(
199 "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", 199 "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}",
200 SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString); 200 SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
201 } 201 }
202 handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation; 202 handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
203 if (handlerUserLoggedInAtLocation != null) 203 if (handlerUserLoggedInAtLocation != null)
204 { 204 {
205 //m_log.Info("[LOGIN]: Letting other objects know about login"); 205 //m_log.Info("[LOGIN]: Letting other objects know about login");
206 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region, 206 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region,
207 theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X,theUser.CurrentAgent.Position.Y,theUser.CurrentAgent.Position.Z, 207 theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X,theUser.CurrentAgent.Position.Y,theUser.CurrentAgent.Position.Z,
208 theUser.FirstName,theUser.SurName); 208 theUser.FirstName,theUser.SurName);
209 } 209 }
@@ -213,7 +213,7 @@ namespace OpenSim.Grid.UserServer
213 { 213 {
214 tryDefault = true; 214 tryDefault = true;
215 } 215 }
216 216
217 if (tryDefault) 217 if (tryDefault)
218 { 218 {
219 // Send him to default region instead 219 // Send him to default region instead
@@ -301,8 +301,8 @@ namespace OpenSim.Grid.UserServer
301 protected override InventoryData GetInventorySkeleton(LLUUID userID) 301 protected override InventoryData GetInventorySkeleton(LLUUID userID)
302 { 302 {
303 m_log.DebugFormat( 303 m_log.DebugFormat(
304 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 304 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
305 m_config.InventoryUrl, userID); 305 m_config.InventoryUrl, userID);
306 306
307 List<InventoryFolderBase> folders 307 List<InventoryFolderBase> folders
308 = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>( 308 = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
@@ -317,23 +317,23 @@ namespace OpenSim.Grid.UserServer
317 // tools are creating the user profile directly in the database without creating the inventory. At 317 // tools are creating the user profile directly in the database without creating the inventory. At
318 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already 318 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already
319 // exist. 319 // exist.
320 bool created = 320 bool created =
321 SynchronousRestObjectPoster.BeginPostObject<Guid, bool>( 321 SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
322 "POST", m_config.InventoryUrl + "CreateInventory/", userID.UUID); 322 "POST", m_config.InventoryUrl + "CreateInventory/", userID.UUID);
323 323
324 if (!created) 324 if (!created)
325 { 325 {
326 throw new Exception( 326 throw new Exception(
327 String.Format( 327 String.Format(
328 "The inventory creation request for user {0} did not succeed." 328 "The inventory creation request for user {0} did not succeed."
329 + " Please contact your inventory service provider for more information.", 329 + " Please contact your inventory service provider for more information.",
330 userID)); 330 userID));
331 } 331 }
332 else 332 else
333 { 333 {
334 m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID); 334 m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID);
335 } 335 }
336 336
337 folders = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>( 337 folders = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
338 "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID); 338 "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);
339 } 339 }
@@ -343,11 +343,11 @@ namespace OpenSim.Grid.UserServer
343 LLUUID rootID = LLUUID.Zero; 343 LLUUID rootID = LLUUID.Zero;
344 ArrayList AgentInventoryArray = new ArrayList(); 344 ArrayList AgentInventoryArray = new ArrayList();
345 Hashtable TempHash; 345 Hashtable TempHash;
346 346
347 foreach (InventoryFolderBase InvFolder in folders) 347 foreach (InventoryFolderBase InvFolder in folders)
348 { 348 {
349// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name); 349// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
350 350
351 if (InvFolder.ParentID == LLUUID.Zero) 351 if (InvFolder.ParentID == LLUUID.Zero)
352 { 352 {
353 rootID = InvFolder.ID; 353 rootID = InvFolder.ID;
@@ -360,14 +360,14 @@ namespace OpenSim.Grid.UserServer
360 TempHash["folder_id"] = InvFolder.ID.ToString(); 360 TempHash["folder_id"] = InvFolder.ID.ToString();
361 AgentInventoryArray.Add(TempHash); 361 AgentInventoryArray.Add(TempHash);
362 } 362 }
363 363
364 return new InventoryData(AgentInventoryArray, rootID); 364 return new InventoryData(AgentInventoryArray, rootID);
365 } 365 }
366 else 366 else
367 { 367 {
368 throw new Exception( 368 throw new Exception(
369 String.Format( 369 String.Format(
370 "A root inventory folder for user {0} could not be retrieved from the inventory service", 370 "A root inventory folder for user {0} could not be retrieved from the inventory service",
371 userID)); 371 userID));
372 } 372 }
373 } 373 }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 5d0e1d6..8372d6a 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer
41 public delegate void logOffUser(LLUUID AgentID); 41 public delegate void logOffUser(LLUUID AgentID);
42 42
43 public class UserManager : UserManagerBase 43 public class UserManager : UserManagerBase
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 public event logOffUser OnLogOffUser; 47 public event logOffUser OnLogOffUser;
@@ -91,7 +91,7 @@ namespace OpenSim.Grid.UserServer
91 responseData["lastname" + i.ToString()] = returnUsers[i].lastName; 91 responseData["lastname" + i.ToString()] = returnUsers[i].lastName;
92 } 92 }
93 response.Value = responseData; 93 response.Value = responseData;
94 94
95 return response; 95 return response;
96 } 96 }
97 97
@@ -182,7 +182,7 @@ namespace OpenSim.Grid.UserServer
182 Hashtable responseData = new Hashtable(); 182 Hashtable responseData = new Hashtable();
183 string returnString = "FALSE"; 183 string returnString = "FALSE";
184 // Query Result Information 184 // Query Result Information
185 185
186 if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms")) 186 if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms"))
187 { 187 {
188 // UserManagerBase.AddNewuserFriend 188 // UserManagerBase.AddNewuserFriend
@@ -201,7 +201,7 @@ namespace OpenSim.Grid.UserServer
201 Hashtable responseData = new Hashtable(); 201 Hashtable responseData = new Hashtable();
202 string returnString = "FALSE"; 202 string returnString = "FALSE";
203 // Query Result Information 203 // Query Result Information
204 204
205 if (requestData.Contains("ownerID") && requestData.Contains("friendID")) 205 if (requestData.Contains("ownerID") && requestData.Contains("friendID"))
206 { 206 {
207 // UserManagerBase.AddNewuserFriend 207 // UserManagerBase.AddNewuserFriend
@@ -219,7 +219,7 @@ namespace OpenSim.Grid.UserServer
219 Hashtable requestData = (Hashtable)request.Params[0]; 219 Hashtable requestData = (Hashtable)request.Params[0];
220 Hashtable responseData = new Hashtable(); 220 Hashtable responseData = new Hashtable();
221 string returnString = "FALSE"; 221 string returnString = "FALSE";
222 222
223 if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms")) 223 if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms"))
224 { 224 {
225 UpdateUserFriendPerms(new LLUUID((string)requestData["ownerID"]), new LLUUID((string)requestData["friendID"]), (uint)Convert.ToInt32((string)requestData["friendPerms"])); 225 UpdateUserFriendPerms(new LLUUID((string)requestData["ownerID"]), new LLUUID((string)requestData["friendID"]), (uint)Convert.ToInt32((string)requestData["friendPerms"]));
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.UserServer
243 { 243 {
244 returndata = this.GetUserFriendList(new LLUUID((string)requestData["ownerID"])); 244 returndata = this.GetUserFriendList(new LLUUID((string)requestData["ownerID"]));
245 } 245 }
246 246
247 return FriendListItemListtoXmlRPCResponse(returndata); 247 return FriendListItemListtoXmlRPCResponse(returndata);
248 } 248 }
249 249
@@ -350,7 +350,7 @@ namespace OpenSim.Grid.UserServer
350 } 350 }
351 // dont' know how yet 351 // dont' know how yet
352 if (requestData.Contains("MaturePublish")) 352 if (requestData.Contains("MaturePublish"))
353 { 353 {
354 } 354 }
355 if (requestData.Contains("AboutText")) 355 if (requestData.Contains("AboutText"))
356 { 356 {
@@ -362,7 +362,7 @@ namespace OpenSim.Grid.UserServer
362 } 362 }
363 // not in DB yet. 363 // not in DB yet.
364 if (requestData.Contains("ProfileURL")) 364 if (requestData.Contains("ProfileURL"))
365 { 365 {
366 } 366 }
367 if (requestData.Contains("home_region")) 367 if (requestData.Contains("home_region"))
368 { 368 {
@@ -382,7 +382,7 @@ namespace OpenSim.Grid.UserServer
382 { 382 {
383 m_log.Error("[PROFILE]:Failed to set home region, Value was too large"); 383 m_log.Error("[PROFILE]:Failed to set home region, Value was too large");
384 } 384 }
385 385
386 } 386 }
387 if (requestData.Contains("home_pos_x")) 387 if (requestData.Contains("home_pos_x"))
388 { 388 {
@@ -442,7 +442,7 @@ namespace OpenSim.Grid.UserServer
442 } 442 }
443 if (requestData.Contains("home_look_z")) 443 if (requestData.Contains("home_look_z"))
444 { 444 {
445 try 445 try
446 { 446 {
447 userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]); 447 userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]);
448 } 448 }