From c995d60d37032db3198b8496e186aa7a892dc7a8 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 14 May 2008 05:11:23 +0000 Subject: Formatting cleanup. --- OpenSim/Grid/GridServer/GridManager.cs | 4 +-- OpenSim/Grid/GridServer/GridServerBase.cs | 2 +- .../ConnectToGridServerDialog.cs | 2 +- .../GridServerConnectionManager.cs | 17 +++++----- .../Grid/Manager/OpenGridServices.Manager/Main.cs | 12 +++---- .../Common/LSL_BuiltIn_Commands_Interface.cs | 38 +++++++++++----------- .../Compiler/Server_API/LSL_BuiltIn_Commands.cs | 2 +- OpenSim/Grid/UserServer.Config/DbUserConfig.cs | 2 +- OpenSim/Grid/UserServer/Main.cs | 4 +-- OpenSim/Grid/UserServer/MessageServersConnector.cs | 2 +- 10 files changed, 43 insertions(+), 42 deletions(-) (limited to 'OpenSim/Grid') 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 catch (FormatException e) { m_log.Warn("[LOGIN PRELUDE]: Invalid login parameters, sending back error response."); - return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString() ); + return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString()); } m_log.InfoFormat("[LOGIN BEGIN]: Received login request from simulator: {0}", sim.regionName); @@ -406,7 +406,7 @@ namespace OpenSim.Grid.GridServer { DataResponse insertResponse; - if( existingSim == null ) + if (existingSim == null) { insertResponse = kvp.Value.AddProfile(sim); } 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 AddHttpHandlers(); - LoadGridPlugins( ); + LoadGridPlugins(); m_httpServer.Start(); 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 protected virtual void OnResponse(object o, Gtk.ResponseArgs args) { - switch(args.ResponseId) { + switch (args.ResponseId) { case Gtk.ResponseType.Ok: MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); 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 LoginParams.Add(LoginParamsHT); XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); - if(GridResp.IsFault) { + if (GridResp.IsFault) { connected=false; return false; } else { @@ -87,14 +87,15 @@ namespace OpenGridServices.Manager // TODO - ERROR! } - for(int i=0; i<=rootnode.ChildNodes.Count; i++) + for (int i = 0; i <= rootnode.ChildNodes.Count; i++) { - if(rootnode.ChildNodes.Item(i).Name != "region") { + if (rootnode.ChildNodes.Item(i).Name != "region") + { // TODO - ERROR! - } else { + } + else + { TempRegionData = new RegionBlock(); - - } } } @@ -112,8 +113,8 @@ namespace OpenGridServices.Manager ShutdownParamsHT["session_id"]=this.SessionID.ToString(); ShutdownParams.Add(ShutdownParamsHT); XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); - XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL,3000); - if(GridResp.IsFault) { + XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000); + if (GridResp.IsFault) { return false; } else { 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 public static void DoMainLoop() { - while(!QuitReq) + while (!QuitReq) { Application.RunIteration(); } @@ -57,15 +57,15 @@ namespace OpenGridServices.Manager string cmd; char[] sep = new char[1]; sep[0]=' '; - while(!QuitReq) + while (!QuitReq) { operation=PendingOperations.Dequeue(); Console.WriteLine(operation); cmd = operation.Split(sep)[0]; - switch(cmd) { + switch (cmd) { case "connect_to_gridserver": win.SetStatus("Connecting to grid server..."); - if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) { + if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3])) { win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); win.SetGridServerConnected(true); Thread.Sleep(3000); @@ -78,7 +78,7 @@ namespace OpenGridServices.Manager case "restart_gridserver": win.SetStatus("Restarting grid server..."); - if(gridserverConn.RestartServer()) { + if (gridserverConn.RestartServer()) { win.SetStatus("Restarted server OK"); Thread.Sleep(3000); win.SetStatus(""); @@ -89,7 +89,7 @@ namespace OpenGridServices.Manager case "shutdown_gridserver": win.SetStatus("Shutting down grid server..."); - if(gridserverConn.ShutdownServer()) { + if (gridserverConn.ShutdownServer()) { win.SetStatus("Grid server shutdown"); win.SetGridServerConnected(false); 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 List llList2List(List src, int start, int end); //wiki: llDeleteSubList(list src, integer start, integer end) List llDeleteSubList(List src, int start, int end); - //wiki: integer llGetListEntryType( list src, integer index ) + //wiki: integer llGetListEntryType(list src, integer index) int llGetListEntryType(List src, int index); - //wiki: string llList2CSV( list src ) + //wiki: string llList2CSV(list src) string llList2CSV(List src); - //wiki: list llCSV2List( string src ) + //wiki: list llCSV2List(string src) List llCSV2List(string src); - //wiki: list llListRandomize( list src, integer stride ) + //wiki: list llListRandomize(list src, integer stride) List llListRandomize(List src, int stride); - //wiki: list llList2ListStrided( list src, integer start, integer end, integer stride ) + //wiki: list llList2ListStrided(list src, integer start, integer end, integer stride) List llList2ListStrided(List src, int start, int end, int stride); - //wiki: vector llGetRegionCorner( ) + //wiki: vector llGetRegionCorner() LSL_Types.Vector3 llGetRegionCorner(); - //wiki: list llListInsertList( list dest, list src, integer start ) + //wiki: list llListInsertList(list dest, list src, integer start) List llListInsertList(List dest, List src, int start); - //wiki: integer llListFindList( list src, list test ) + //wiki: integer llListFindList(list src, list test) int llListFindList(List src, List test); //wiki: string llGetObjectName() string llGetObjectName(); @@ -469,7 +469,7 @@ namespace OpenSim.Grid.ScriptEngine.Common void llDumpList2String(); //wiki: integer llScriptDanger(vector pos) void llScriptDanger(LSL_Types.Vector3 pos); - //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel ) + //wiki: llDialog(key avatar, string message, list buttons, integer chat_channel) void llDialog(string avatar, string message, List buttons, int chat_channel); //wiki: llVolumeDetect(integer detect) void llVolumeDetect(int detect); @@ -493,7 +493,7 @@ namespace OpenSim.Grid.ScriptEngine.Common void llCloseRemoteDataChannel(string channel); //wiki: string llMD5String(string src, integer nonce) string llMD5String(string src, int nonce); - //wiki: llSetPrimitiveParams( list rules ) + //wiki: llSetPrimitiveParams(list rules) void llSetPrimitiveParams(List rules); //wiki: string llStringToBase64(string str) string llStringToBase64(string str); @@ -507,7 +507,7 @@ namespace OpenSim.Grid.ScriptEngine.Common double llLog10(double val); //wiki: double llLog(double val) double llLog(double val); - //wiki: list llGetAnimationList( key id ) + //wiki: list llGetAnimationList(key id) List llGetAnimationList(string id); //wiki: llSetParcelMusicURL(string url) void llSetParcelMusicURL(string url); @@ -529,7 +529,7 @@ namespace OpenSim.Grid.ScriptEngine.Common int llGetNumberOfPrims(); //wiki: key llGetNumberOfNotecardLines(string name) string llGetNumberOfNotecardLines(string name); - //wiki: list llGetBoundingBox( key object ) + //wiki: list llGetBoundingBox(key object) List llGetBoundingBox(string obj); //wiki: vector llGetGeometricCenter() LSL_Types.Vector3 llGetGeometricCenter(); @@ -544,7 +544,7 @@ namespace OpenSim.Grid.ScriptEngine.Common string llGetSimulatorHostname(); //llSetLocalRot(rotation rot) void llSetLocalRot(LSL_Types.Quaternion rot); - //wiki: list llParseStringKeepNulls( string src, list separators, list spacers ) + //wiki: list llParseStringKeepNulls(string src, list separators, list spacers) List llParseStringKeepNulls(string src, List seperators, List spacers); //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param) void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, @@ -571,14 +571,14 @@ namespace OpenSim.Grid.ScriptEngine.Common void llListReplaceList(); //wiki: llLoadURL(key avatar_id, string message, string url) void llLoadURL(string avatar_id, string message, string url); - //wiki: llParcelMediaCommandList( list commandList ) + //wiki: llParcelMediaCommandList(list commandList) void llParcelMediaCommandList(List commandList); void llParcelMediaQuery(); //wiki integer llModPow(integer a, integer b, integer c) int llModPow(int a, int b, int c); //wiki: integer llGetInventoryType(string name) int llGetInventoryType(string name); - //wiki: llSetPayPrice( integer price, list quick_pay_buttons ) + //wiki: llSetPayPrice(integer price, list quick_pay_buttons) void llSetPayPrice(int price, List quick_pay_buttons); //wiki: vector llGetCameraPos() LSL_Types.Vector3 llGetCameraPos(); @@ -600,11 +600,11 @@ namespace OpenSim.Grid.ScriptEngine.Common void llRemoveFromLandPassList(string avatar); //wiki: llRemoveFromLandBanList(key avatar) void llRemoveFromLandBanList(string avatar); - //wiki: llSetCameraParams( list rules ) + //wiki: llSetCameraParams(list rules) void llSetCameraParams(List rules); //wiki: llClearCameraParams() void llClearCameraParams(); - //wiki: double llListStatistics( integer operation, list src ) + //wiki: double llListStatistics(integer operation, list src) double llListStatistics(int operation, List src); //wiki: integer llGetUnixTime() int llGetUnixTime(); @@ -621,11 +621,11 @@ namespace OpenSim.Grid.ScriptEngine.Common void llResetLandPassList(); //wiki integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide); - //wiki: list llGetParcelPrimOwners( vector pos ) + //wiki: list llGetParcelPrimOwners(vector pos) List llGetParcelPrimOwners(LSL_Types.Vector3 pos); //wiki: integer llGetObjectPrimCount(key object_id) int llGetObjectPrimCount(string object_id); - //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide ) + //wiki: integer llGetParcelMaxPrims(vector pos, integer sim_wide) int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide); //wiki list llGetParcelDetails(vector pos, list params) List llGetParcelDetails(LSL_Types.Vector3 pos, List 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 if (chunk.Count > 0) tmp.Add(chunk); - // Decreate (<- what kind of word is that? :D ) array back into a list + // Decreate (<- what kind of word is that? :D) array back into a list int rnd; List ret = new List(); 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 { db = Db4oFactory.OpenFile("openuser.yap"); IObjectSet result = db.Get(typeof(DbUserConfig)); - if(result.Count==1) + if (result.Count == 1) { m_log.Info("[DBUSERCONFIG]: DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading"); 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 float positionZ, string firstname, string lastname) { - m_messagesService.TellMessageServersAboutUser( agentID, sessionID, RegionID, regionhandle, positionX, - positionY, positionZ, firstname, lastname); + m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX, + positionY, positionZ, firstname, lastname); } } } 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 ulong regionhandle, float positionX, float positionY, float positionZ, string firstname, string lastname) { - // Loop over registered Message Servers ( AND THERE WILL BE MORE THEN ONE :D ) + // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D) lock (MessageServers) { if (MessageServers.Count > 0) -- cgit v1.1