diff options
author | Adam Frisby | 2008-05-01 16:03:53 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 16:03:53 +0000 |
commit | 523190377861292dfecdaddebe1204301a0c7912 (patch) | |
tree | c003fa3c03389fc2d701d6797557c693a4eb29fc /OpenSim/Region | |
parent | Add basic OS X support to LaunchSLClient (diff) | |
download | opensim-SC_OLD-523190377861292dfecdaddebe1204301a0c7912.zip opensim-SC_OLD-523190377861292dfecdaddebe1204301a0c7912.tar.gz opensim-SC_OLD-523190377861292dfecdaddebe1204301a0c7912.tar.bz2 opensim-SC_OLD-523190377861292dfecdaddebe1204301a0c7912.tar.xz |
* In ur code. Making it static.
* Converted a bunch of functions to static functions.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMainConsole.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index ac5a1ec..e727d63 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs | |||
@@ -172,7 +172,7 @@ namespace OpenSim | |||
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | private void PrintFileToConsole(string fileName) | 175 | private static void PrintFileToConsole(string fileName) |
176 | { | 176 | { |
177 | if (File.Exists(fileName)) | 177 | if (File.Exists(fileName)) |
178 | { | 178 | { |
@@ -690,7 +690,7 @@ namespace OpenSim | |||
690 | } | 690 | } |
691 | } | 691 | } |
692 | 692 | ||
693 | private string CombineParams(string[] commandParams, int pos) | 693 | private static string CombineParams(string[] commandParams, int pos) |
694 | { | 694 | { |
695 | string result = String.Empty; | 695 | string result = String.Empty; |
696 | for (int i = pos; i < commandParams.Length; i++) | 696 | for (int i = pos; i < commandParams.Length; i++) |
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs index 72c10f3..c4a721e 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | |||
@@ -337,7 +337,7 @@ namespace OpenSim.DataStore.MSSQL | |||
337 | * | 337 | * |
338 | **********************************************************************/ | 338 | **********************************************************************/ |
339 | 339 | ||
340 | private void createCol(DataTable dt, string name, Type type) | 340 | private static void createCol(DataTable dt, string name, Type type) |
341 | { | 341 | { |
342 | DataColumn col = new DataColumn(name, type); | 342 | DataColumn col = new DataColumn(name, type); |
343 | dt.Columns.Add(col); | 343 | dt.Columns.Add(col); |
@@ -467,7 +467,7 @@ namespace OpenSim.DataStore.MSSQL | |||
467 | * | 467 | * |
468 | **********************************************************************/ | 468 | **********************************************************************/ |
469 | 469 | ||
470 | private SceneObjectPart buildPrim(DataRow row) | 470 | private static SceneObjectPart buildPrim(DataRow row) |
471 | { | 471 | { |
472 | // TODO: this doesn't work yet because something more | 472 | // TODO: this doesn't work yet because something more |
473 | // interesting has to be done to actually get these values | 473 | // interesting has to be done to actually get these values |
@@ -553,7 +553,7 @@ namespace OpenSim.DataStore.MSSQL | |||
553 | } | 553 | } |
554 | 554 | ||
555 | 555 | ||
556 | private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) | 556 | private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) |
557 | { | 557 | { |
558 | row["UUID"] = prim.UUID; | 558 | row["UUID"] = prim.UUID; |
559 | row["RegionUUID"] = regionUUID; | 559 | row["RegionUUID"] = regionUUID; |