diff options
Diffstat (limited to 'OpenSim/Grid')
10 files changed, 43 insertions, 42 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 84a515c..c2c212c 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -371,7 +371,7 @@ namespace OpenSim.Grid.GridServer | |||
371 | catch (FormatException e) | 371 | catch (FormatException e) |
372 | { | 372 | { |
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); |
@@ -406,7 +406,7 @@ namespace OpenSim.Grid.GridServer | |||
406 | { | 406 | { |
407 | DataResponse insertResponse; | 407 | DataResponse insertResponse; |
408 | 408 | ||
409 | if( existingSim == null ) | 409 | if (existingSim == null) |
410 | { | 410 | { |
411 | insertResponse = kvp.Value.AddProfile(sim); | 411 | insertResponse = kvp.Value.AddProfile(sim); |
412 | } | 412 | } |
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index aeaead5..88a9561 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Grid.GridServer | |||
87 | 87 | ||
88 | AddHttpHandlers(); | 88 | AddHttpHandlers(); |
89 | 89 | ||
90 | LoadGridPlugins( ); | 90 | LoadGridPlugins(); |
91 | 91 | ||
92 | m_httpServer.Start(); | 92 | m_httpServer.Start(); |
93 | 93 | ||
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs index da359a7..b6b2b64 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs | |||
@@ -39,7 +39,7 @@ namespace OpenGridServices.Manager | |||
39 | 39 | ||
40 | protected virtual void OnResponse(object o, Gtk.ResponseArgs args) | 40 | protected virtual void OnResponse(object o, Gtk.ResponseArgs args) |
41 | { | 41 | { |
42 | switch(args.ResponseId) { | 42 | switch (args.ResponseId) { |
43 | case Gtk.ResponseType.Ok: | 43 | case Gtk.ResponseType.Ok: |
44 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); | 44 | MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); |
45 | break; | 45 | break; |
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs index 995dd8c..a386fa8 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs | |||
@@ -55,7 +55,7 @@ namespace OpenGridServices.Manager | |||
55 | LoginParams.Add(LoginParamsHT); | 55 | LoginParams.Add(LoginParamsHT); |
56 | XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); | 56 | XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); |
57 | XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); | 57 | XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); |
58 | if(GridResp.IsFault) { | 58 | if (GridResp.IsFault) { |
59 | connected=false; | 59 | connected=false; |
60 | return false; | 60 | return false; |
61 | } else { | 61 | } else { |
@@ -87,14 +87,15 @@ namespace OpenGridServices.Manager | |||
87 | // TODO - ERROR! | 87 | // TODO - ERROR! |
88 | } | 88 | } |
89 | 89 | ||
90 | for(int i=0; i<=rootnode.ChildNodes.Count; i++) | 90 | for (int i = 0; i <= rootnode.ChildNodes.Count; i++) |
91 | { | 91 | { |
92 | if(rootnode.ChildNodes.Item(i).Name != "region") { | 92 | if (rootnode.ChildNodes.Item(i).Name != "region") |
93 | { | ||
93 | // TODO - ERROR! | 94 | // TODO - ERROR! |
94 | } else { | 95 | } |
96 | else | ||
97 | { | ||
95 | TempRegionData = new RegionBlock(); | 98 | TempRegionData = new RegionBlock(); |
96 | |||
97 | |||
98 | } | 99 | } |
99 | } | 100 | } |
100 | } | 101 | } |
@@ -112,8 +113,8 @@ namespace OpenGridServices.Manager | |||
112 | ShutdownParamsHT["session_id"]=this.SessionID.ToString(); | 113 | ShutdownParamsHT["session_id"]=this.SessionID.ToString(); |
113 | ShutdownParams.Add(ShutdownParamsHT); | 114 | ShutdownParams.Add(ShutdownParamsHT); |
114 | XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); | 115 | XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); |
115 | XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL,3000); | 116 | XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000); |
116 | if(GridResp.IsFault) { | 117 | if (GridResp.IsFault) { |
117 | return false; | 118 | return false; |
118 | } else { | 119 | } else { |
119 | connected=false; | 120 | connected=false; |
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs index 33e577d..6b7a5ab 100644 --- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs +++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs | |||
@@ -45,7 +45,7 @@ namespace OpenGridServices.Manager | |||
45 | 45 | ||
46 | public static void DoMainLoop() | 46 | public static void DoMainLoop() |
47 | { | 47 | { |
48 | while(!QuitReq) | 48 | while (!QuitReq) |
49 | { | 49 | { |
50 | Application.RunIteration(); | 50 | Application.RunIteration(); |
51 | } | 51 | } |
@@ -57,15 +57,15 @@ namespace OpenGridServices.Manager | |||
57 | string cmd; | 57 | string cmd; |
58 | char[] sep = new char[1]; | 58 | char[] sep = new char[1]; |
59 | sep[0]=' '; | 59 | sep[0]=' '; |
60 | while(!QuitReq) | 60 | while (!QuitReq) |
61 | { | 61 | { |
62 | operation=PendingOperations.Dequeue(); | 62 | operation=PendingOperations.Dequeue(); |
63 | Console.WriteLine(operation); | 63 | Console.WriteLine(operation); |
64 | cmd = operation.Split(sep)[0]; | 64 | cmd = operation.Split(sep)[0]; |
65 | switch(cmd) { | 65 | switch (cmd) { |
66 | case "connect_to_gridserver": | 66 | case "connect_to_gridserver": |
67 | win.SetStatus("Connecting to grid server..."); | 67 | win.SetStatus("Connecting to grid server..."); |
68 | if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) { | 68 | if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3])) { |
69 | win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); | 69 | win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); |
70 | win.SetGridServerConnected(true); | 70 | win.SetGridServerConnected(true); |
71 | Thread.Sleep(3000); | 71 | Thread.Sleep(3000); |
@@ -78,7 +78,7 @@ namespace OpenGridServices.Manager | |||
78 | 78 | ||
79 | case "restart_gridserver": | 79 | case "restart_gridserver": |
80 | win.SetStatus("Restarting grid server..."); | 80 | win.SetStatus("Restarting grid server..."); |
81 | if(gridserverConn.RestartServer()) { | 81 | if (gridserverConn.RestartServer()) { |
82 | win.SetStatus("Restarted server OK"); | 82 | win.SetStatus("Restarted server OK"); |
83 | Thread.Sleep(3000); | 83 | Thread.Sleep(3000); |
84 | win.SetStatus(""); | 84 | win.SetStatus(""); |
@@ -89,7 +89,7 @@ namespace OpenGridServices.Manager | |||
89 | 89 | ||
90 | case "shutdown_gridserver": | 90 | case "shutdown_gridserver": |
91 | win.SetStatus("Shutting down grid server..."); | 91 | win.SetStatus("Shutting down grid server..."); |
92 | if(gridserverConn.ShutdownServer()) { | 92 | if (gridserverConn.ShutdownServer()) { |
93 | win.SetStatus("Grid server shutdown"); | 93 | win.SetStatus("Grid server shutdown"); |
94 | win.SetGridServerConnected(false); | 94 | win.SetGridServerConnected(false); |
95 | Thread.Sleep(3000); | 95 | Thread.Sleep(3000); |
diff --git a/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs index 764c1ab..3411465 100644 --- a/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs +++ b/OpenSim/Grid/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs | |||
@@ -364,21 +364,21 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
364 | List<string> llList2List(List<string> src, int start, int end); | 364 | List<string> llList2List(List<string> src, int start, int end); |
365 | //wiki: llDeleteSubList(list src, integer start, integer end) | 365 | //wiki: llDeleteSubList(list src, integer start, integer end) |
366 | List<string> llDeleteSubList(List<string> src, int start, int end); | 366 | List<string> llDeleteSubList(List<string> src, int start, int end); |
367 | //wiki: integer llGetListEntryType( list src, integer index ) | 367 | //wiki: integer llGetListEntryType(list src, integer index) |
368 | int llGetListEntryType(List<string> src, int index); | 368 | int llGetListEntryType(List<string> src, int index); |
369 | //wiki: string llList2CSV( list src ) | 369 | //wiki: string llList2CSV(list src) |
370 | string llList2CSV(List<string> src); | 370 | string llList2CSV(List<string> src); |
371 | //wiki: list llCSV2List( string src ) | 371 | //wiki: list llCSV2List(string src) |
372 | List<string> llCSV2List(string src); | 372 | List<string> llCSV2List(string src); |
373 | //wiki: list llListRandomize( list src, integer stride ) | 373 | //wiki: list llListRandomize(list src, integer stride) |
374 | List<string> llListRandomize(List<string> src, int stride); | 374 | List<string> llListRandomize(List<string> src, int stride); |
375 | //wiki: list llList2ListStrided( list src, integer start, integer end, integer stride ) | 375 | //wiki: list llList2ListStrided(list src, integer start, integer end, integer stride) |
376 | List<string> llList2ListStrided(List<string> src, int start, int end, int stride); | 376 | List<string> llList2ListStrided(List<string> src, int start, int end, int stride); |
377 | //wiki: vector llGetRegionCorner( ) | 377 | //wiki: vector llGetRegionCorner() |
378 | LSL_Types.Vector3 llGetRegionCorner(); | 378 | LSL_Types.Vector3 llGetRegionCorner(); |
379 | //wiki: list llListInsertList( list dest, list src, integer start ) | 379 | //wiki: list llListInsertList(list dest, list src, integer start) |
380 | List<string> llListInsertList(List<string> dest, List<string> src, int start); | 380 | List<string> llListInsertList(List<string> dest, List<string> src, int start); |
381 | //wiki: integer llListFindList( list src, list test ) | 381 | //wiki: integer llListFindList(list src, list test) |
382 | int llListFindList(List<string> src, List<string> test); | 382 | int llListFindList(List<string> src, List<string> test); |
383 | //wiki: string llGetObjectName() | 383 | //wiki: string llGetObjectName() |
384 | string llGetObjectName(); | 384 | string llGetObjectName(); |
@@ -469,7 +469,7 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
469 | void llDumpList2String(); | 469 | void llDumpList2String(); |
470 | //wiki: integer llScriptDanger(vector pos) | 470 | //wiki: integer llScriptDanger(vector pos) |
471 | void llScriptDanger(LSL_Types.Vector3 pos); | 471 | void llScriptDanger(LSL_Types.Vector3 pos); |
472 | //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel ) | 472 | //wiki: llDialog(key avatar, string message, list buttons, integer chat_channel) |
473 | void llDialog(string avatar, string message, List<string> buttons, int chat_channel); | 473 | void llDialog(string avatar, string message, List<string> buttons, int chat_channel); |
474 | //wiki: llVolumeDetect(integer detect) | 474 | //wiki: llVolumeDetect(integer detect) |
475 | void llVolumeDetect(int detect); | 475 | void llVolumeDetect(int detect); |
@@ -493,7 +493,7 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
493 | void llCloseRemoteDataChannel(string channel); | 493 | void llCloseRemoteDataChannel(string channel); |
494 | //wiki: string llMD5String(string src, integer nonce) | 494 | //wiki: string llMD5String(string src, integer nonce) |
495 | string llMD5String(string src, int nonce); | 495 | string llMD5String(string src, int nonce); |
496 | //wiki: llSetPrimitiveParams( list rules ) | 496 | //wiki: llSetPrimitiveParams(list rules) |
497 | void llSetPrimitiveParams(List<string> rules); | 497 | void llSetPrimitiveParams(List<string> rules); |
498 | //wiki: string llStringToBase64(string str) | 498 | //wiki: string llStringToBase64(string str) |
499 | string llStringToBase64(string str); | 499 | string llStringToBase64(string str); |
@@ -507,7 +507,7 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
507 | double llLog10(double val); | 507 | double llLog10(double val); |
508 | //wiki: double llLog(double val) | 508 | //wiki: double llLog(double val) |
509 | double llLog(double val); | 509 | double llLog(double val); |
510 | //wiki: list llGetAnimationList( key id ) | 510 | //wiki: list llGetAnimationList(key id) |
511 | List<string> llGetAnimationList(string id); | 511 | List<string> llGetAnimationList(string id); |
512 | //wiki: llSetParcelMusicURL(string url) | 512 | //wiki: llSetParcelMusicURL(string url) |
513 | void llSetParcelMusicURL(string url); | 513 | void llSetParcelMusicURL(string url); |
@@ -529,7 +529,7 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
529 | int llGetNumberOfPrims(); | 529 | int llGetNumberOfPrims(); |
530 | //wiki: key llGetNumberOfNotecardLines(string name) | 530 | //wiki: key llGetNumberOfNotecardLines(string name) |
531 | string llGetNumberOfNotecardLines(string name); | 531 | string llGetNumberOfNotecardLines(string name); |
532 | //wiki: list llGetBoundingBox( key object ) | 532 | //wiki: list llGetBoundingBox(key object) |
533 | List<string> llGetBoundingBox(string obj); | 533 | List<string> llGetBoundingBox(string obj); |
534 | //wiki: vector llGetGeometricCenter() | 534 | //wiki: vector llGetGeometricCenter() |
535 | LSL_Types.Vector3 llGetGeometricCenter(); | 535 | LSL_Types.Vector3 llGetGeometricCenter(); |
@@ -544,7 +544,7 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
544 | string llGetSimulatorHostname(); | 544 | string llGetSimulatorHostname(); |
545 | //llSetLocalRot(rotation rot) | 545 | //llSetLocalRot(rotation rot) |
546 | void llSetLocalRot(LSL_Types.Quaternion rot); | 546 | void llSetLocalRot(LSL_Types.Quaternion rot); |
547 | //wiki: list llParseStringKeepNulls( string src, list separators, list spacers ) | 547 | //wiki: list llParseStringKeepNulls(string src, list separators, list spacers) |
548 | List<string> llParseStringKeepNulls(string src, List<string> seperators, List<string> spacers); | 548 | List<string> llParseStringKeepNulls(string src, List<string> seperators, List<string> spacers); |
549 | //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param) | 549 | //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param) |
550 | void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, | 550 | void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, |
@@ -571,14 +571,14 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
571 | void llListReplaceList(); | 571 | void llListReplaceList(); |
572 | //wiki: llLoadURL(key avatar_id, string message, string url) | 572 | //wiki: llLoadURL(key avatar_id, string message, string url) |
573 | void llLoadURL(string avatar_id, string message, string url); | 573 | void llLoadURL(string avatar_id, string message, string url); |
574 | //wiki: llParcelMediaCommandList( list commandList ) | 574 | //wiki: llParcelMediaCommandList(list commandList) |
575 | void llParcelMediaCommandList(List<string> commandList); | 575 | void llParcelMediaCommandList(List<string> commandList); |
576 | void llParcelMediaQuery(); | 576 | void llParcelMediaQuery(); |
577 | //wiki integer llModPow(integer a, integer b, integer c) | 577 | //wiki integer llModPow(integer a, integer b, integer c) |
578 | int llModPow(int a, int b, int c); | 578 | int llModPow(int a, int b, int c); |
579 | //wiki: integer llGetInventoryType(string name) | 579 | //wiki: integer llGetInventoryType(string name) |
580 | int llGetInventoryType(string name); | 580 | int llGetInventoryType(string name); |
581 | //wiki: llSetPayPrice( integer price, list quick_pay_buttons ) | 581 | //wiki: llSetPayPrice(integer price, list quick_pay_buttons) |
582 | void llSetPayPrice(int price, List<string> quick_pay_buttons); | 582 | void llSetPayPrice(int price, List<string> quick_pay_buttons); |
583 | //wiki: vector llGetCameraPos() | 583 | //wiki: vector llGetCameraPos() |
584 | LSL_Types.Vector3 llGetCameraPos(); | 584 | LSL_Types.Vector3 llGetCameraPos(); |
@@ -600,11 +600,11 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
600 | void llRemoveFromLandPassList(string avatar); | 600 | void llRemoveFromLandPassList(string avatar); |
601 | //wiki: llRemoveFromLandBanList(key avatar) | 601 | //wiki: llRemoveFromLandBanList(key avatar) |
602 | void llRemoveFromLandBanList(string avatar); | 602 | void llRemoveFromLandBanList(string avatar); |
603 | //wiki: llSetCameraParams( list rules ) | 603 | //wiki: llSetCameraParams(list rules) |
604 | void llSetCameraParams(List<string> rules); | 604 | void llSetCameraParams(List<string> rules); |
605 | //wiki: llClearCameraParams() | 605 | //wiki: llClearCameraParams() |
606 | void llClearCameraParams(); | 606 | void llClearCameraParams(); |
607 | //wiki: double llListStatistics( integer operation, list src ) | 607 | //wiki: double llListStatistics(integer operation, list src) |
608 | double llListStatistics(int operation, List<string> src); | 608 | double llListStatistics(int operation, List<string> src); |
609 | //wiki: integer llGetUnixTime() | 609 | //wiki: integer llGetUnixTime() |
610 | int llGetUnixTime(); | 610 | int llGetUnixTime(); |
@@ -621,11 +621,11 @@ namespace OpenSim.Grid.ScriptEngine.Common | |||
621 | void llResetLandPassList(); | 621 | void llResetLandPassList(); |
622 | //wiki integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) | 622 | //wiki integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) |
623 | int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide); | 623 | int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide); |
624 | //wiki: list llGetParcelPrimOwners( vector pos ) | 624 | //wiki: list llGetParcelPrimOwners(vector pos) |
625 | List<string> llGetParcelPrimOwners(LSL_Types.Vector3 pos); | 625 | List<string> llGetParcelPrimOwners(LSL_Types.Vector3 pos); |
626 | //wiki: integer llGetObjectPrimCount(key object_id) | 626 | //wiki: integer llGetObjectPrimCount(key object_id) |
627 | int llGetObjectPrimCount(string object_id); | 627 | int llGetObjectPrimCount(string object_id); |
628 | //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide ) | 628 | //wiki: integer llGetParcelMaxPrims(vector pos, integer sim_wide) |
629 | int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide); | 629 | int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide); |
630 | //wiki list llGetParcelDetails(vector pos, list params) | 630 | //wiki list llGetParcelDetails(vector pos, list params) |
631 | List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param); | 631 | List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param); |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index 3b5ecb5..64d3493 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | |||
@@ -1333,7 +1333,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler | |||
1333 | if (chunk.Count > 0) | 1333 | if (chunk.Count > 0) |
1334 | tmp.Add(chunk); | 1334 | tmp.Add(chunk); |
1335 | 1335 | ||
1336 | // Decreate (<- what kind of word is that? :D ) array back into a list | 1336 | // Decreate (<- what kind of word is that? :D) array back into a list |
1337 | int rnd; | 1337 | int rnd; |
1338 | List<string> ret = new List<string>(); | 1338 | List<string> ret = new List<string>(); |
1339 | while (tmp.Count > 0) | 1339 | while (tmp.Count > 0) |
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs index 2162403..0f29bbe 100644 --- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs +++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs | |||
@@ -65,7 +65,7 @@ namespace OpenUser.Config.UserConfigDb4o | |||
65 | { | 65 | { |
66 | db = Db4oFactory.OpenFile("openuser.yap"); | 66 | db = Db4oFactory.OpenFile("openuser.yap"); |
67 | IObjectSet result = db.Get(typeof(DbUserConfig)); | 67 | IObjectSet result = db.Get(typeof(DbUserConfig)); |
68 | if(result.Count==1) | 68 | if (result.Count == 1) |
69 | { | 69 | { |
70 | m_log.Info("[DBUSERCONFIG]: DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading"); | 70 | m_log.Info("[DBUSERCONFIG]: DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading"); |
71 | foreach (DbUserConfig cfg in result) | 71 | foreach (DbUserConfig cfg in result) |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index e1ccd02..7cd2431 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -266,8 +266,8 @@ namespace OpenSim.Grid.UserServer | |||
266 | float positionZ, string firstname, string lastname) | 266 | float positionZ, string firstname, string lastname) |
267 | { | 267 | { |
268 | 268 | ||
269 | m_messagesService.TellMessageServersAboutUser( agentID, sessionID, RegionID, regionhandle, positionX, | 269 | m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX, |
270 | positionY, positionZ, firstname, lastname); | 270 | positionY, positionZ, firstname, lastname); |
271 | } | 271 | } |
272 | } | 272 | } |
273 | } | 273 | } |
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index 28f5c4c..4e9728e 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs | |||
@@ -159,7 +159,7 @@ namespace OpenSim.Grid.UserServer | |||
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) |
163 | lock (MessageServers) | 163 | lock (MessageServers) |
164 | { | 164 | { |
165 | if (MessageServers.Count > 0) | 165 | if (MessageServers.Count > 0) |