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 | |
parent | Add basic OS X support to LaunchSLClient (diff) | |
download | opensim-SC-523190377861292dfecdaddebe1204301a0c7912.zip opensim-SC-523190377861292dfecdaddebe1204301a0c7912.tar.gz opensim-SC-523190377861292dfecdaddebe1204301a0c7912.tar.bz2 opensim-SC-523190377861292dfecdaddebe1204301a0c7912.tar.xz |
* In ur code. Making it static.
* Converted a bunch of functions to static functions.
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLDataStore.cs | 44 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLDataStore.cs | 44 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 14 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 34 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMainConsole.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 6 |
12 files changed, 86 insertions, 86 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 6f82181..e540e4d 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -267,7 +267,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
267 | } | 267 | } |
268 | 268 | ||
269 | 269 | ||
270 | private void checkStringParameters(XmlRpcRequest request, string[] param) | 270 | private static void checkStringParameters(XmlRpcRequest request, string[] param) |
271 | { | 271 | { |
272 | Hashtable requestData = (Hashtable) request.Params[0]; | 272 | Hashtable requestData = (Hashtable) request.Params[0]; |
273 | foreach (string p in param) | 273 | foreach (string p in param) |
@@ -279,7 +279,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
279 | } | 279 | } |
280 | } | 280 | } |
281 | 281 | ||
282 | private void checkIntegerParams(XmlRpcRequest request, string[] param) | 282 | private static void checkIntegerParams(XmlRpcRequest request, string[] param) |
283 | { | 283 | { |
284 | Hashtable requestData = (Hashtable) request.Params[0]; | 284 | Hashtable requestData = (Hashtable) request.Params[0]; |
285 | foreach (string p in param) | 285 | foreach (string p in param) |
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 82aab13..44bc660 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs | |||
@@ -536,14 +536,14 @@ namespace OpenSim.Data.MSSQL | |||
536 | * | 536 | * |
537 | **********************************************************************/ | 537 | **********************************************************************/ |
538 | 538 | ||
539 | private DataColumn createCol(DataTable dt, string name, Type type) | 539 | private static DataColumn createCol(DataTable dt, string name, Type type) |
540 | { | 540 | { |
541 | DataColumn col = new DataColumn(name, type); | 541 | DataColumn col = new DataColumn(name, type); |
542 | dt.Columns.Add(col); | 542 | dt.Columns.Add(col); |
543 | return col; | 543 | return col; |
544 | } | 544 | } |
545 | 545 | ||
546 | private DataTable createTerrainTable() | 546 | private static DataTable createTerrainTable() |
547 | { | 547 | { |
548 | DataTable terrain = new DataTable("terrain"); | 548 | DataTable terrain = new DataTable("terrain"); |
549 | 549 | ||
@@ -554,7 +554,7 @@ namespace OpenSim.Data.MSSQL | |||
554 | return terrain; | 554 | return terrain; |
555 | } | 555 | } |
556 | 556 | ||
557 | private DataTable createPrimTable() | 557 | private static DataTable createPrimTable() |
558 | { | 558 | { |
559 | DataTable prims = new DataTable("prims"); | 559 | DataTable prims = new DataTable("prims"); |
560 | 560 | ||
@@ -618,7 +618,7 @@ namespace OpenSim.Data.MSSQL | |||
618 | return prims; | 618 | return prims; |
619 | } | 619 | } |
620 | 620 | ||
621 | private DataTable createLandTable() | 621 | private static DataTable createLandTable() |
622 | { | 622 | { |
623 | DataTable land = new DataTable("land"); | 623 | DataTable land = new DataTable("land"); |
624 | createCol(land, "UUID", typeof(String)); | 624 | createCol(land, "UUID", typeof(String)); |
@@ -661,7 +661,7 @@ namespace OpenSim.Data.MSSQL | |||
661 | return land; | 661 | return land; |
662 | } | 662 | } |
663 | 663 | ||
664 | private DataTable createLandAccessListTable() | 664 | private static DataTable createLandAccessListTable() |
665 | { | 665 | { |
666 | DataTable landaccess = new DataTable("landaccesslist"); | 666 | DataTable landaccess = new DataTable("landaccesslist"); |
667 | createCol(landaccess, "LandUUID", typeof(String)); | 667 | createCol(landaccess, "LandUUID", typeof(String)); |
@@ -671,7 +671,7 @@ namespace OpenSim.Data.MSSQL | |||
671 | return landaccess; | 671 | return landaccess; |
672 | } | 672 | } |
673 | 673 | ||
674 | private DataTable createShapeTable() | 674 | private static DataTable createShapeTable() |
675 | { | 675 | { |
676 | DataTable shapes = new DataTable("primshapes"); | 676 | DataTable shapes = new DataTable("primshapes"); |
677 | createCol(shapes, "UUID", typeof(String)); | 677 | createCol(shapes, "UUID", typeof(String)); |
@@ -713,7 +713,7 @@ namespace OpenSim.Data.MSSQL | |||
713 | return shapes; | 713 | return shapes; |
714 | } | 714 | } |
715 | 715 | ||
716 | private DataTable createItemsTable() | 716 | private static DataTable createItemsTable() |
717 | { | 717 | { |
718 | DataTable items = new DataTable("primitems"); | 718 | DataTable items = new DataTable("primitems"); |
719 | 719 | ||
@@ -848,7 +848,7 @@ namespace OpenSim.Data.MSSQL | |||
848 | /// </summary> | 848 | /// </summary> |
849 | /// <param name="row"></param> | 849 | /// <param name="row"></param> |
850 | /// <returns></returns> | 850 | /// <returns></returns> |
851 | private TaskInventoryItem buildItem(DataRow row) | 851 | private static TaskInventoryItem buildItem(DataRow row) |
852 | { | 852 | { |
853 | TaskInventoryItem taskItem = new TaskInventoryItem(); | 853 | TaskInventoryItem taskItem = new TaskInventoryItem(); |
854 | 854 | ||
@@ -877,7 +877,7 @@ namespace OpenSim.Data.MSSQL | |||
877 | return taskItem; | 877 | return taskItem; |
878 | } | 878 | } |
879 | 879 | ||
880 | private LandData buildLandData(DataRow row) | 880 | private static LandData buildLandData(DataRow row) |
881 | { | 881 | { |
882 | LandData newData = new LandData(); | 882 | LandData newData = new LandData(); |
883 | 883 | ||
@@ -922,7 +922,7 @@ namespace OpenSim.Data.MSSQL | |||
922 | return newData; | 922 | return newData; |
923 | } | 923 | } |
924 | 924 | ||
925 | private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) | 925 | private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) |
926 | { | 926 | { |
927 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 927 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
928 | entry.AgentID = new LLUUID((string)row["AccessUUID"]); | 928 | entry.AgentID = new LLUUID((string)row["AccessUUID"]); |
@@ -931,7 +931,7 @@ namespace OpenSim.Data.MSSQL | |||
931 | return entry; | 931 | return entry; |
932 | } | 932 | } |
933 | 933 | ||
934 | private Array serializeTerrain(double[,] val) | 934 | private static Array serializeTerrain(double[,] val) |
935 | { | 935 | { |
936 | MemoryStream str = new MemoryStream(65536 * sizeof(double)); | 936 | MemoryStream str = new MemoryStream(65536 * sizeof(double)); |
937 | BinaryWriter bw = new BinaryWriter(str); | 937 | BinaryWriter bw = new BinaryWriter(str); |
@@ -1020,7 +1020,7 @@ namespace OpenSim.Data.MSSQL | |||
1020 | } | 1020 | } |
1021 | } | 1021 | } |
1022 | 1022 | ||
1023 | private void fillItemRow(DataRow row, TaskInventoryItem taskItem) | 1023 | private static void fillItemRow(DataRow row, TaskInventoryItem taskItem) |
1024 | { | 1024 | { |
1025 | row["itemID"] = taskItem.ItemID; | 1025 | row["itemID"] = taskItem.ItemID; |
1026 | row["primID"] = taskItem.ParentPartID; | 1026 | row["primID"] = taskItem.ParentPartID; |
@@ -1044,7 +1044,7 @@ namespace OpenSim.Data.MSSQL | |||
1044 | row["groupPermissions"] = taskItem.GroupMask; | 1044 | row["groupPermissions"] = taskItem.GroupMask; |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | private void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) | 1047 | private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) |
1048 | { | 1048 | { |
1049 | row["UUID"] = land.globalID.UUID; | 1049 | row["UUID"] = land.globalID.UUID; |
1050 | row["RegionUUID"] = regionUUID.UUID; | 1050 | row["RegionUUID"] = regionUUID.UUID; |
@@ -1082,14 +1082,14 @@ namespace OpenSim.Data.MSSQL | |||
1082 | row["UserLookAtZ"] = land.userLookAt.Z; | 1082 | row["UserLookAtZ"] = land.userLookAt.Z; |
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | private void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) | 1085 | private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) |
1086 | { | 1086 | { |
1087 | row["LandUUID"] = parcelID.UUID; | 1087 | row["LandUUID"] = parcelID.UUID; |
1088 | row["AccessUUID"] = entry.AgentID.UUID; | 1088 | row["AccessUUID"] = entry.AgentID.UUID; |
1089 | row["Flags"] = entry.Flags; | 1089 | row["Flags"] = entry.Flags; |
1090 | } | 1090 | } |
1091 | 1091 | ||
1092 | private PrimitiveBaseShape buildShape(DataRow row) | 1092 | private static PrimitiveBaseShape buildShape(DataRow row) |
1093 | { | 1093 | { |
1094 | PrimitiveBaseShape s = new PrimitiveBaseShape(); | 1094 | PrimitiveBaseShape s = new PrimitiveBaseShape(); |
1095 | s.Scale = new LLVector3( | 1095 | s.Scale = new LLVector3( |
@@ -1128,7 +1128,7 @@ namespace OpenSim.Data.MSSQL | |||
1128 | return s; | 1128 | return s; |
1129 | } | 1129 | } |
1130 | 1130 | ||
1131 | private void fillShapeRow(DataRow row, SceneObjectPart prim) | 1131 | private static void fillShapeRow(DataRow row, SceneObjectPart prim) |
1132 | { | 1132 | { |
1133 | PrimitiveBaseShape s = prim.Shape; | 1133 | PrimitiveBaseShape s = prim.Shape; |
1134 | row["UUID"] = prim.UUID; | 1134 | row["UUID"] = prim.UUID; |
@@ -1235,7 +1235,7 @@ namespace OpenSim.Data.MSSQL | |||
1235 | * | 1235 | * |
1236 | **********************************************************************/ | 1236 | **********************************************************************/ |
1237 | 1237 | ||
1238 | private SqlCommand createInsertCommand(string table, DataTable dt) | 1238 | private static SqlCommand createInsertCommand(string table, DataTable dt) |
1239 | { | 1239 | { |
1240 | /** | 1240 | /** |
1241 | * This is subtle enough to deserve some commentary. | 1241 | * This is subtle enough to deserve some commentary. |
@@ -1270,7 +1270,7 @@ namespace OpenSim.Data.MSSQL | |||
1270 | return cmd; | 1270 | return cmd; |
1271 | } | 1271 | } |
1272 | 1272 | ||
1273 | private SqlCommand createUpdateCommand(string table, string pk, DataTable dt) | 1273 | private static SqlCommand createUpdateCommand(string table, string pk, DataTable dt) |
1274 | { | 1274 | { |
1275 | string sql = "update " + table + " set "; | 1275 | string sql = "update " + table + " set "; |
1276 | string subsql = String.Empty; | 1276 | string subsql = String.Empty; |
@@ -1297,7 +1297,7 @@ namespace OpenSim.Data.MSSQL | |||
1297 | return cmd; | 1297 | return cmd; |
1298 | } | 1298 | } |
1299 | 1299 | ||
1300 | private string defineTable(DataTable dt) | 1300 | private static string defineTable(DataTable dt) |
1301 | { | 1301 | { |
1302 | string sql = "create table " + dt.TableName + "("; | 1302 | string sql = "create table " + dt.TableName + "("; |
1303 | string subsql = String.Empty; | 1303 | string subsql = String.Empty; |
@@ -1340,7 +1340,7 @@ namespace OpenSim.Data.MSSQL | |||
1340 | /// for us. | 1340 | /// for us. |
1341 | ///</summary> | 1341 | ///</summary> |
1342 | ///<returns>a built Sql parameter</returns> | 1342 | ///<returns>a built Sql parameter</returns> |
1343 | private SqlParameter createSqlParameter(string name, Type type) | 1343 | private static SqlParameter createSqlParameter(string name, Type type) |
1344 | { | 1344 | { |
1345 | SqlParameter param = new SqlParameter(); | 1345 | SqlParameter param = new SqlParameter(); |
1346 | param.ParameterName = "@" + name; | 1346 | param.ParameterName = "@" + name; |
@@ -1413,7 +1413,7 @@ namespace OpenSim.Data.MSSQL | |||
1413 | da.DeleteCommand = delete; | 1413 | da.DeleteCommand = delete; |
1414 | } | 1414 | } |
1415 | 1415 | ||
1416 | private void InitDB(SqlConnection conn) | 1416 | private static void InitDB(SqlConnection conn) |
1417 | { | 1417 | { |
1418 | string createPrims = defineTable(createPrimTable()); | 1418 | string createPrims = defineTable(createPrimTable()); |
1419 | string createShapes = defineTable(createShapeTable()); | 1419 | string createShapes = defineTable(createShapeTable()); |
@@ -1586,7 +1586,7 @@ namespace OpenSim.Data.MSSQL | |||
1586 | * | 1586 | * |
1587 | **********************************************************************/ | 1587 | **********************************************************************/ |
1588 | 1588 | ||
1589 | private DbType dbtypeFromType(Type type) | 1589 | private static DbType dbtypeFromType(Type type) |
1590 | { | 1590 | { |
1591 | if (type == typeof(String)) | 1591 | if (type == typeof(String)) |
1592 | { | 1592 | { |
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index e23178c..032b2c2 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |||
@@ -302,7 +302,7 @@ namespace OpenSim.Data.MSSQL | |||
302 | /// </summary> | 302 | /// </summary> |
303 | /// <param name="reader">The SQL Result</param> | 303 | /// <param name="reader">The SQL Result</param> |
304 | /// <returns>the item read</returns> | 304 | /// <returns>the item read</returns> |
305 | private InventoryItemBase readInventoryItem(IDataReader reader) | 305 | private static InventoryItemBase readInventoryItem(IDataReader reader) |
306 | { | 306 | { |
307 | try | 307 | try |
308 | { | 308 | { |
@@ -379,7 +379,7 @@ namespace OpenSim.Data.MSSQL | |||
379 | /// </summary> | 379 | /// </summary> |
380 | /// <param name="reader">A MySQL Data Reader</param> | 380 | /// <param name="reader">A MySQL Data Reader</param> |
381 | /// <returns>A List containing inventory folders</returns> | 381 | /// <returns>A List containing inventory folders</returns> |
382 | protected InventoryFolderBase readInventoryFolder(IDataReader reader) | 382 | protected static InventoryFolderBase readInventoryFolder(IDataReader reader) |
383 | { | 383 | { |
384 | try | 384 | try |
385 | { | 385 | { |
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index 33981de..c3fe332 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs | |||
@@ -627,24 +627,24 @@ namespace OpenSim.Data.MySQL | |||
627 | * | 627 | * |
628 | **********************************************************************/ | 628 | **********************************************************************/ |
629 | 629 | ||
630 | private DataColumn createCol(DataTable dt, string name, Type type) | 630 | private static DataColumn createCol(DataTable dt, string name, Type type) |
631 | { | 631 | { |
632 | DataColumn col = new DataColumn(name, type); | 632 | DataColumn col = new DataColumn(name, type); |
633 | dt.Columns.Add(col); | 633 | dt.Columns.Add(col); |
634 | return col; | 634 | return col; |
635 | } | 635 | } |
636 | 636 | ||
637 | private DataTable createTerrainTable() | 637 | private static DataTable createTerrainTable() |
638 | { | 638 | { |
639 | DataTable terrain = new DataTable("terrain"); | 639 | DataTable terrain = new DataTable("terrain"); |
640 | 640 | ||
641 | createCol(terrain, "RegionUUID", typeof (String)); | 641 | createCol(terrain, "RegionUUID", typeof (String)); |
642 | createCol(terrain, "Revision", typeof (Int32)); | 642 | createCol(terrain, "Revision", typeof (Int32)); |
643 | DataColumn heightField = createCol(terrain, "Heightfield", typeof (Byte[])); | 643 | createCol(terrain, "Heightfield", typeof (Byte[])); |
644 | return terrain; | 644 | return terrain; |
645 | } | 645 | } |
646 | 646 | ||
647 | private DataTable createPrimTable() | 647 | private static DataTable createPrimTable() |
648 | { | 648 | { |
649 | DataTable prims = new DataTable("prims"); | 649 | DataTable prims = new DataTable("prims"); |
650 | 650 | ||
@@ -708,7 +708,7 @@ namespace OpenSim.Data.MySQL | |||
708 | return prims; | 708 | return prims; |
709 | } | 709 | } |
710 | 710 | ||
711 | private DataTable createLandTable() | 711 | private static DataTable createLandTable() |
712 | { | 712 | { |
713 | DataTable land = new DataTable("land"); | 713 | DataTable land = new DataTable("land"); |
714 | createCol(land, "UUID", typeof (String)); | 714 | createCol(land, "UUID", typeof (String)); |
@@ -752,7 +752,7 @@ namespace OpenSim.Data.MySQL | |||
752 | return land; | 752 | return land; |
753 | } | 753 | } |
754 | 754 | ||
755 | private DataTable createLandAccessListTable() | 755 | private static DataTable createLandAccessListTable() |
756 | { | 756 | { |
757 | DataTable landaccess = new DataTable("landaccesslist"); | 757 | DataTable landaccess = new DataTable("landaccesslist"); |
758 | createCol(landaccess, "LandUUID", typeof (String)); | 758 | createCol(landaccess, "LandUUID", typeof (String)); |
@@ -762,7 +762,7 @@ namespace OpenSim.Data.MySQL | |||
762 | return landaccess; | 762 | return landaccess; |
763 | } | 763 | } |
764 | 764 | ||
765 | private DataTable createShapeTable() | 765 | private static DataTable createShapeTable() |
766 | { | 766 | { |
767 | DataTable shapes = new DataTable("primshapes"); | 767 | DataTable shapes = new DataTable("primshapes"); |
768 | createCol(shapes, "UUID", typeof (String)); | 768 | createCol(shapes, "UUID", typeof (String)); |
@@ -802,7 +802,7 @@ namespace OpenSim.Data.MySQL | |||
802 | return shapes; | 802 | return shapes; |
803 | } | 803 | } |
804 | 804 | ||
805 | private DataTable createItemsTable() | 805 | private static DataTable createItemsTable() |
806 | { | 806 | { |
807 | DataTable items = new DataTable("primitems"); | 807 | DataTable items = new DataTable("primitems"); |
808 | 808 | ||
@@ -937,7 +937,7 @@ namespace OpenSim.Data.MySQL | |||
937 | /// </summary> | 937 | /// </summary> |
938 | /// <param name="row"></param> | 938 | /// <param name="row"></param> |
939 | /// <returns></returns> | 939 | /// <returns></returns> |
940 | private TaskInventoryItem buildItem(DataRow row) | 940 | private static TaskInventoryItem buildItem(DataRow row) |
941 | { | 941 | { |
942 | TaskInventoryItem taskItem = new TaskInventoryItem(); | 942 | TaskInventoryItem taskItem = new TaskInventoryItem(); |
943 | 943 | ||
@@ -966,7 +966,7 @@ namespace OpenSim.Data.MySQL | |||
966 | return taskItem; | 966 | return taskItem; |
967 | } | 967 | } |
968 | 968 | ||
969 | private LandData buildLandData(DataRow row) | 969 | private static LandData buildLandData(DataRow row) |
970 | { | 970 | { |
971 | LandData newData = new LandData(); | 971 | LandData newData = new LandData(); |
972 | 972 | ||
@@ -1018,7 +1018,7 @@ namespace OpenSim.Data.MySQL | |||
1018 | return newData; | 1018 | return newData; |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) | 1021 | private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) |
1022 | { | 1022 | { |
1023 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 1023 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
1024 | entry.AgentID = new LLUUID((string) row["AccessUUID"]); | 1024 | entry.AgentID = new LLUUID((string) row["AccessUUID"]); |
@@ -1027,7 +1027,7 @@ namespace OpenSim.Data.MySQL | |||
1027 | return entry; | 1027 | return entry; |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | private Array serializeTerrain(double[,] val) | 1030 | private static Array serializeTerrain(double[,] val) |
1031 | { | 1031 | { |
1032 | MemoryStream str = new MemoryStream(65536*sizeof (double)); | 1032 | MemoryStream str = new MemoryStream(65536*sizeof (double)); |
1033 | BinaryWriter bw = new BinaryWriter(str); | 1033 | BinaryWriter bw = new BinaryWriter(str); |
@@ -1116,7 +1116,7 @@ namespace OpenSim.Data.MySQL | |||
1116 | } | 1116 | } |
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | private void fillItemRow(DataRow row, TaskInventoryItem taskItem) | 1119 | private static void fillItemRow(DataRow row, TaskInventoryItem taskItem) |
1120 | { | 1120 | { |
1121 | row["itemID"] = taskItem.ItemID; | 1121 | row["itemID"] = taskItem.ItemID; |
1122 | row["primID"] = taskItem.ParentPartID; | 1122 | row["primID"] = taskItem.ParentPartID; |
@@ -1140,7 +1140,7 @@ namespace OpenSim.Data.MySQL | |||
1140 | row["groupPermissions"] = taskItem.GroupMask; | 1140 | row["groupPermissions"] = taskItem.GroupMask; |
1141 | } | 1141 | } |
1142 | 1142 | ||
1143 | private void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) | 1143 | private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) |
1144 | { | 1144 | { |
1145 | row["UUID"] = Util.ToRawUuidString(land.globalID); | 1145 | row["UUID"] = Util.ToRawUuidString(land.globalID); |
1146 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); | 1146 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); |
@@ -1179,7 +1179,7 @@ namespace OpenSim.Data.MySQL | |||
1179 | row["AuthBuyerID"] = land.authBuyerID; | 1179 | row["AuthBuyerID"] = land.authBuyerID; |
1180 | } | 1180 | } |
1181 | 1181 | ||
1182 | private void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) | 1182 | private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) |
1183 | { | 1183 | { |
1184 | row["LandUUID"] = Util.ToRawUuidString(parcelID); | 1184 | row["LandUUID"] = Util.ToRawUuidString(parcelID); |
1185 | row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); | 1185 | row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); |
@@ -1364,7 +1364,7 @@ namespace OpenSim.Data.MySQL | |||
1364 | * | 1364 | * |
1365 | **********************************************************************/ | 1365 | **********************************************************************/ |
1366 | 1366 | ||
1367 | private MySqlCommand createInsertCommand(string table, DataTable dt) | 1367 | private static MySqlCommand createInsertCommand(string table, DataTable dt) |
1368 | { | 1368 | { |
1369 | /** | 1369 | /** |
1370 | * This is subtle enough to deserve some commentary. | 1370 | * This is subtle enough to deserve some commentary. |
@@ -1399,7 +1399,7 @@ namespace OpenSim.Data.MySQL | |||
1399 | return cmd; | 1399 | return cmd; |
1400 | } | 1400 | } |
1401 | 1401 | ||
1402 | private MySqlCommand createUpdateCommand(string table, string pk, DataTable dt) | 1402 | private static MySqlCommand createUpdateCommand(string table, string pk, DataTable dt) |
1403 | { | 1403 | { |
1404 | string sql = "update " + table + " set "; | 1404 | string sql = "update " + table + " set "; |
1405 | string subsql = String.Empty; | 1405 | string subsql = String.Empty; |
@@ -1426,7 +1426,7 @@ namespace OpenSim.Data.MySQL | |||
1426 | return cmd; | 1426 | return cmd; |
1427 | } | 1427 | } |
1428 | 1428 | ||
1429 | private string defineTable(DataTable dt) | 1429 | private static string defineTable(DataTable dt) |
1430 | { | 1430 | { |
1431 | string sql = "create table " + dt.TableName + "("; | 1431 | string sql = "create table " + dt.TableName + "("; |
1432 | string subsql = String.Empty; | 1432 | string subsql = String.Empty; |
@@ -1471,7 +1471,7 @@ namespace OpenSim.Data.MySQL | |||
1471 | /// for us. | 1471 | /// for us. |
1472 | ///</summary> | 1472 | ///</summary> |
1473 | ///<returns>a built MySql parameter</returns> | 1473 | ///<returns>a built MySql parameter</returns> |
1474 | private MySqlParameter createMySqlParameter(string name, Type type) | 1474 | private static MySqlParameter createMySqlParameter(string name, Type type) |
1475 | { | 1475 | { |
1476 | MySqlParameter param = new MySqlParameter(); | 1476 | MySqlParameter param = new MySqlParameter(); |
1477 | param.ParameterName = "?" + name; | 1477 | param.ParameterName = "?" + name; |
@@ -1546,7 +1546,7 @@ namespace OpenSim.Data.MySQL | |||
1546 | da.DeleteCommand = delete; | 1546 | da.DeleteCommand = delete; |
1547 | } | 1547 | } |
1548 | 1548 | ||
1549 | private void InitDB(MySqlConnection conn) | 1549 | private static void InitDB(MySqlConnection conn) |
1550 | { | 1550 | { |
1551 | string createPrims = defineTable(createPrimTable()); | 1551 | string createPrims = defineTable(createPrimTable()); |
1552 | string createShapes = defineTable(createShapeTable()); | 1552 | string createShapes = defineTable(createShapeTable()); |
@@ -1734,7 +1734,7 @@ namespace OpenSim.Data.MySQL | |||
1734 | * | 1734 | * |
1735 | **********************************************************************/ | 1735 | **********************************************************************/ |
1736 | 1736 | ||
1737 | private DbType dbtypeFromType(Type type) | 1737 | private static DbType dbtypeFromType(Type type) |
1738 | { | 1738 | { |
1739 | if (type == typeof (String)) | 1739 | if (type == typeof (String)) |
1740 | { | 1740 | { |
@@ -1768,7 +1768,7 @@ namespace OpenSim.Data.MySQL | |||
1768 | 1768 | ||
1769 | // this is something we'll need to implement for each db | 1769 | // this is something we'll need to implement for each db |
1770 | // slightly differently. | 1770 | // slightly differently. |
1771 | private string MySqlType(Type type) | 1771 | private static string MySqlType(Type type) |
1772 | { | 1772 | { |
1773 | if (type == typeof (String)) | 1773 | if (type == typeof (String)) |
1774 | { | 1774 | { |
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 592ade9..c9765c0 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -314,7 +314,7 @@ namespace OpenSim.Data.MySQL | |||
314 | /// </summary> | 314 | /// </summary> |
315 | /// <param name="reader">The SQL Result</param> | 315 | /// <param name="reader">The SQL Result</param> |
316 | /// <returns>the item read</returns> | 316 | /// <returns>the item read</returns> |
317 | private InventoryItemBase readInventoryItem(MySqlDataReader reader) | 317 | private static InventoryItemBase readInventoryItem(MySqlDataReader reader) |
318 | { | 318 | { |
319 | try | 319 | try |
320 | { | 320 | { |
@@ -438,7 +438,7 @@ namespace OpenSim.Data.MySQL | |||
438 | /// </summary> | 438 | /// </summary> |
439 | /// <param name="reader">A MySQL Data Reader</param> | 439 | /// <param name="reader">A MySQL Data Reader</param> |
440 | /// <returns>A List containing inventory folders</returns> | 440 | /// <returns>A List containing inventory folders</returns> |
441 | protected InventoryFolderBase readInventoryFolder(MySqlDataReader reader) | 441 | protected static InventoryFolderBase readInventoryFolder(MySqlDataReader reader) |
442 | { | 442 | { |
443 | try | 443 | try |
444 | { | 444 | { |
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index c0fe26c..ece1c2d 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -111,7 +111,7 @@ namespace OpenSim.Data.NHibernate | |||
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
114 | private void SetAgentData(LLUUID uuid, UserAgentData agent, ISession session) | 114 | private static void SetAgentData(LLUUID uuid, UserAgentData agent, ISession session) |
115 | { | 115 | { |
116 | if (agent == null) | 116 | if (agent == null) |
117 | { | 117 | { |
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index db4848a..fa5d5e2 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite | |||
135 | 135 | ||
136 | } | 136 | } |
137 | 137 | ||
138 | private void LogAssetLoad(AssetBase asset) | 138 | private static void LogAssetLoad(AssetBase asset) |
139 | { | 139 | { |
140 | string temporary = asset.Temporary ? "Temporary" : "Stored"; | 140 | string temporary = asset.Temporary ? "Temporary" : "Stored"; |
141 | string local = asset.Local ? "Local" : "Remote"; | 141 | string local = asset.Local ? "Local" : "Remote"; |
@@ -197,7 +197,7 @@ namespace OpenSim.Data.SQLite | |||
197 | * | 197 | * |
198 | **********************************************************************/ | 198 | **********************************************************************/ |
199 | 199 | ||
200 | private DataTable createAssetsTable() | 200 | private static DataTable createAssetsTable() |
201 | { | 201 | { |
202 | DataTable assets = new DataTable("assets"); | 202 | DataTable assets = new DataTable("assets"); |
203 | 203 | ||
@@ -222,7 +222,7 @@ namespace OpenSim.Data.SQLite | |||
222 | * | 222 | * |
223 | **********************************************************************/ | 223 | **********************************************************************/ |
224 | 224 | ||
225 | private AssetBase buildAsset(IDataReader row) | 225 | private static AssetBase buildAsset(IDataReader row) |
226 | { | 226 | { |
227 | // TODO: this doesn't work yet because something more | 227 | // TODO: this doesn't work yet because something more |
228 | // interesting has to be done to actually get these values | 228 | // interesting has to be done to actually get these values |
@@ -250,14 +250,14 @@ namespace OpenSim.Data.SQLite | |||
250 | * | 250 | * |
251 | **********************************************************************/ | 251 | **********************************************************************/ |
252 | 252 | ||
253 | private void InitDB(SqliteConnection conn) | 253 | private static void InitDB(SqliteConnection conn) |
254 | { | 254 | { |
255 | string createAssets = SQLiteUtil.defineTable(createAssetsTable()); | 255 | string createAssets = SQLiteUtil.defineTable(createAssetsTable()); |
256 | SqliteCommand pcmd = new SqliteCommand(createAssets, conn); | 256 | SqliteCommand pcmd = new SqliteCommand(createAssets, conn); |
257 | pcmd.ExecuteNonQuery(); | 257 | pcmd.ExecuteNonQuery(); |
258 | } | 258 | } |
259 | 259 | ||
260 | private bool TestTables(SqliteConnection conn) | 260 | private static bool TestTables(SqliteConnection conn) |
261 | { | 261 | { |
262 | SqliteCommand cmd = new SqliteCommand(assetSelect, conn); | 262 | SqliteCommand cmd = new SqliteCommand(assetSelect, conn); |
263 | SqliteDataAdapter pDa = new SqliteDataAdapter(cmd); | 263 | SqliteDataAdapter pDa = new SqliteDataAdapter(cmd); |
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index 4b28795..40978da 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite | |||
124 | return item; | 124 | return item; |
125 | } | 125 | } |
126 | 126 | ||
127 | private void fillItemRow(DataRow row, InventoryItemBase item) | 127 | private static void fillItemRow(DataRow row, InventoryItemBase item) |
128 | { | 128 | { |
129 | row["UUID"] = Util.ToRawUuidString(item.ID); | 129 | row["UUID"] = Util.ToRawUuidString(item.ID); |
130 | row["assetID"] = Util.ToRawUuidString(item.AssetID); | 130 | row["assetID"] = Util.ToRawUuidString(item.AssetID); |
@@ -576,7 +576,7 @@ namespace OpenSim.Data.SQLite | |||
576 | return inv; | 576 | return inv; |
577 | } | 577 | } |
578 | 578 | ||
579 | private DataTable createInventoryFoldersTable() | 579 | private static DataTable createInventoryFoldersTable() |
580 | { | 580 | { |
581 | DataTable fol = new DataTable("inventoryfolders"); | 581 | DataTable fol = new DataTable("inventoryfolders"); |
582 | 582 | ||
@@ -625,7 +625,7 @@ namespace OpenSim.Data.SQLite | |||
625 | } | 625 | } |
626 | } | 626 | } |
627 | 627 | ||
628 | private InventoryFolderBase buildFolder(DataRow row) | 628 | private static InventoryFolderBase buildFolder(DataRow row) |
629 | { | 629 | { |
630 | InventoryFolderBase folder = new InventoryFolderBase(); | 630 | InventoryFolderBase folder = new InventoryFolderBase(); |
631 | folder.ID = new LLUUID((string) row["UUID"]); | 631 | folder.ID = new LLUUID((string) row["UUID"]); |
@@ -637,7 +637,7 @@ namespace OpenSim.Data.SQLite | |||
637 | return folder; | 637 | return folder; |
638 | } | 638 | } |
639 | 639 | ||
640 | private void fillFolderRow(DataRow row, InventoryFolderBase folder) | 640 | private static void fillFolderRow(DataRow row, InventoryFolderBase folder) |
641 | { | 641 | { |
642 | row["UUID"] = Util.ToRawUuidString(folder.ID); | 642 | row["UUID"] = Util.ToRawUuidString(folder.ID); |
643 | row["name"] = folder.Name; | 643 | row["name"] = folder.Name; |
@@ -647,7 +647,7 @@ namespace OpenSim.Data.SQLite | |||
647 | row["version"] = folder.Version; | 647 | row["version"] = folder.Version; |
648 | } | 648 | } |
649 | 649 | ||
650 | private void moveFolderRow(DataRow row, InventoryFolderBase folder) | 650 | private static void moveFolderRow(DataRow row, InventoryFolderBase folder) |
651 | { | 651 | { |
652 | row["UUID"] = Util.ToRawUuidString(folder.ID); | 652 | row["UUID"] = Util.ToRawUuidString(folder.ID); |
653 | row["parentID"] = Util.ToRawUuidString(folder.ParentID); | 653 | row["parentID"] = Util.ToRawUuidString(folder.ParentID); |
@@ -659,7 +659,7 @@ namespace OpenSim.Data.SQLite | |||
659 | * | 659 | * |
660 | **********************************************************************/ | 660 | **********************************************************************/ |
661 | 661 | ||
662 | private void InitDB(SqliteConnection conn) | 662 | private static void InitDB(SqliteConnection conn) |
663 | { | 663 | { |
664 | string createInventoryItems = defineTable(createInventoryItemsTable()); | 664 | string createInventoryItems = defineTable(createInventoryItemsTable()); |
665 | string createInventoryFolders = defineTable(createInventoryFoldersTable()); | 665 | string createInventoryFolders = defineTable(createInventoryFoldersTable()); |
@@ -671,7 +671,7 @@ namespace OpenSim.Data.SQLite | |||
671 | scmd.ExecuteNonQuery(); | 671 | scmd.ExecuteNonQuery(); |
672 | } | 672 | } |
673 | 673 | ||
674 | private bool TestTables(SqliteConnection conn) | 674 | private static bool TestTables(SqliteConnection conn) |
675 | { | 675 | { |
676 | SqliteCommand invItemsSelectCmd = new SqliteCommand(invItemsSelect, conn); | 676 | SqliteCommand invItemsSelectCmd = new SqliteCommand(invItemsSelect, conn); |
677 | SqliteDataAdapter pDa = new SqliteDataAdapter(invItemsSelectCmd); | 677 | SqliteDataAdapter pDa = new SqliteDataAdapter(invItemsSelectCmd); |
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index ea12a48..9a610a4 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -572,13 +572,13 @@ namespace OpenSim.Data.SQLite | |||
572 | * | 572 | * |
573 | **********************************************************************/ | 573 | **********************************************************************/ |
574 | 574 | ||
575 | private void createCol(DataTable dt, string name, Type type) | 575 | private static void createCol(DataTable dt, string name, Type type) |
576 | { | 576 | { |
577 | DataColumn col = new DataColumn(name, type); | 577 | DataColumn col = new DataColumn(name, type); |
578 | dt.Columns.Add(col); | 578 | dt.Columns.Add(col); |
579 | } | 579 | } |
580 | 580 | ||
581 | private DataTable createTerrainTable() | 581 | private static DataTable createTerrainTable() |
582 | { | 582 | { |
583 | DataTable terrain = new DataTable("terrain"); | 583 | DataTable terrain = new DataTable("terrain"); |
584 | 584 | ||
@@ -589,7 +589,7 @@ namespace OpenSim.Data.SQLite | |||
589 | return terrain; | 589 | return terrain; |
590 | } | 590 | } |
591 | 591 | ||
592 | private DataTable createPrimTable() | 592 | private static DataTable createPrimTable() |
593 | { | 593 | { |
594 | DataTable prims = new DataTable("prims"); | 594 | DataTable prims = new DataTable("prims"); |
595 | 595 | ||
@@ -653,7 +653,7 @@ namespace OpenSim.Data.SQLite | |||
653 | return prims; | 653 | return prims; |
654 | } | 654 | } |
655 | 655 | ||
656 | private DataTable createShapeTable() | 656 | private static DataTable createShapeTable() |
657 | { | 657 | { |
658 | DataTable shapes = new DataTable("primshapes"); | 658 | DataTable shapes = new DataTable("primshapes"); |
659 | createCol(shapes, "UUID", typeof (String)); | 659 | createCol(shapes, "UUID", typeof (String)); |
@@ -695,7 +695,7 @@ namespace OpenSim.Data.SQLite | |||
695 | return shapes; | 695 | return shapes; |
696 | } | 696 | } |
697 | 697 | ||
698 | private DataTable createItemsTable() | 698 | private static DataTable createItemsTable() |
699 | { | 699 | { |
700 | DataTable items = new DataTable("primitems"); | 700 | DataTable items = new DataTable("primitems"); |
701 | 701 | ||
@@ -727,7 +727,7 @@ namespace OpenSim.Data.SQLite | |||
727 | return items; | 727 | return items; |
728 | } | 728 | } |
729 | 729 | ||
730 | private DataTable createLandTable() | 730 | private static DataTable createLandTable() |
731 | { | 731 | { |
732 | DataTable land = new DataTable("land"); | 732 | DataTable land = new DataTable("land"); |
733 | createCol(land, "UUID", typeof (String)); | 733 | createCol(land, "UUID", typeof (String)); |
@@ -771,7 +771,7 @@ namespace OpenSim.Data.SQLite | |||
771 | return land; | 771 | return land; |
772 | } | 772 | } |
773 | 773 | ||
774 | private DataTable createLandAccessListTable() | 774 | private static DataTable createLandAccessListTable() |
775 | { | 775 | { |
776 | DataTable landaccess = new DataTable("landaccesslist"); | 776 | DataTable landaccess = new DataTable("landaccesslist"); |
777 | createCol(landaccess, "LandUUID", typeof (String)); | 777 | createCol(landaccess, "LandUUID", typeof (String)); |
@@ -901,7 +901,7 @@ namespace OpenSim.Data.SQLite | |||
901 | /// </summary> | 901 | /// </summary> |
902 | /// <param name="row"></param> | 902 | /// <param name="row"></param> |
903 | /// <returns></returns> | 903 | /// <returns></returns> |
904 | private TaskInventoryItem buildItem(DataRow row) | 904 | private static TaskInventoryItem buildItem(DataRow row) |
905 | { | 905 | { |
906 | TaskInventoryItem taskItem = new TaskInventoryItem(); | 906 | TaskInventoryItem taskItem = new TaskInventoryItem(); |
907 | 907 | ||
@@ -1008,7 +1008,7 @@ namespace OpenSim.Data.SQLite | |||
1008 | return newData; | 1008 | return newData; |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | private ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) | 1011 | private static ParcelManager.ParcelAccessEntry buildLandAccessData(DataRow row) |
1012 | { | 1012 | { |
1013 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 1013 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
1014 | entry.AgentID = new LLUUID((string) row["AccessUUID"]); | 1014 | entry.AgentID = new LLUUID((string) row["AccessUUID"]); |
@@ -1017,7 +1017,7 @@ namespace OpenSim.Data.SQLite | |||
1017 | return entry; | 1017 | return entry; |
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | private Array serializeTerrain(double[,] val) | 1020 | private static Array serializeTerrain(double[,] val) |
1021 | { | 1021 | { |
1022 | MemoryStream str = new MemoryStream(65536*sizeof (double)); | 1022 | MemoryStream str = new MemoryStream(65536*sizeof (double)); |
1023 | BinaryWriter bw = new BinaryWriter(str); | 1023 | BinaryWriter bw = new BinaryWriter(str); |
@@ -1046,7 +1046,7 @@ namespace OpenSim.Data.SQLite | |||
1046 | // row["Heightfield"] = str.ToArray(); | 1046 | // row["Heightfield"] = str.ToArray(); |
1047 | // } | 1047 | // } |
1048 | 1048 | ||
1049 | private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) | 1049 | private static void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) |
1050 | { | 1050 | { |
1051 | row["UUID"] = Util.ToRawUuidString(prim.UUID); | 1051 | row["UUID"] = Util.ToRawUuidString(prim.UUID); |
1052 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); | 1052 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); |
@@ -1106,7 +1106,7 @@ namespace OpenSim.Data.SQLite | |||
1106 | row["SitTargetOrientZ"] = sitTargetOrient.Z; | 1106 | row["SitTargetOrientZ"] = sitTargetOrient.Z; |
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | private void fillItemRow(DataRow row, TaskInventoryItem taskItem) | 1109 | private static void fillItemRow(DataRow row, TaskInventoryItem taskItem) |
1110 | { | 1110 | { |
1111 | row["itemID"] = taskItem.ItemID; | 1111 | row["itemID"] = taskItem.ItemID; |
1112 | row["primID"] = taskItem.ParentPartID; | 1112 | row["primID"] = taskItem.ParentPartID; |
@@ -1130,7 +1130,7 @@ namespace OpenSim.Data.SQLite | |||
1130 | row["groupPermissions"] = taskItem.GroupMask; | 1130 | row["groupPermissions"] = taskItem.GroupMask; |
1131 | } | 1131 | } |
1132 | 1132 | ||
1133 | private void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) | 1133 | private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) |
1134 | { | 1134 | { |
1135 | row["UUID"] = Util.ToRawUuidString(land.globalID); | 1135 | row["UUID"] = Util.ToRawUuidString(land.globalID); |
1136 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); | 1136 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); |
@@ -1169,7 +1169,7 @@ namespace OpenSim.Data.SQLite | |||
1169 | row["AuthbuyerID"] = Util.ToRawUuidString(land.authBuyerID); | 1169 | row["AuthbuyerID"] = Util.ToRawUuidString(land.authBuyerID); |
1170 | } | 1170 | } |
1171 | 1171 | ||
1172 | private void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) | 1172 | private static void fillLandAccessRow(DataRow row, ParcelManager.ParcelAccessEntry entry, LLUUID parcelID) |
1173 | { | 1173 | { |
1174 | row["LandUUID"] = Util.ToRawUuidString(parcelID); | 1174 | row["LandUUID"] = Util.ToRawUuidString(parcelID); |
1175 | row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); | 1175 | row["AccessUUID"] = Util.ToRawUuidString(entry.AgentID); |
@@ -1242,7 +1242,7 @@ namespace OpenSim.Data.SQLite | |||
1242 | return s; | 1242 | return s; |
1243 | } | 1243 | } |
1244 | 1244 | ||
1245 | private void fillShapeRow(DataRow row, SceneObjectPart prim) | 1245 | private static void fillShapeRow(DataRow row, SceneObjectPart prim) |
1246 | { | 1246 | { |
1247 | PrimitiveBaseShape s = prim.Shape; | 1247 | PrimitiveBaseShape s = prim.Shape; |
1248 | row["UUID"] = Util.ToRawUuidString(prim.UUID); | 1248 | row["UUID"] = Util.ToRawUuidString(prim.UUID); |
@@ -1713,7 +1713,7 @@ namespace OpenSim.Data.SQLite | |||
1713 | * | 1713 | * |
1714 | **********************************************************************/ | 1714 | **********************************************************************/ |
1715 | 1715 | ||
1716 | private DbType dbtypeFromType(Type type) | 1716 | private static DbType dbtypeFromType(Type type) |
1717 | { | 1717 | { |
1718 | if (type == typeof (String)) | 1718 | if (type == typeof (String)) |
1719 | { | 1719 | { |
@@ -1747,7 +1747,7 @@ namespace OpenSim.Data.SQLite | |||
1747 | 1747 | ||
1748 | // this is something we'll need to implement for each db | 1748 | // this is something we'll need to implement for each db |
1749 | // slightly differently. | 1749 | // slightly differently. |
1750 | private string sqliteType(Type type) | 1750 | private static string sqliteType(Type type) |
1751 | { | 1751 | { |
1752 | if (type == typeof (String)) | 1752 | if (type == typeof (String)) |
1753 | { | 1753 | { |
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs index ec90f34..7f017b7 100644 --- a/OpenSim/Data/SQLite/SQLiteUserData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserData.cs | |||
@@ -752,7 +752,7 @@ namespace OpenSim.Data.SQLite | |||
752 | 752 | ||
753 | } | 753 | } |
754 | 754 | ||
755 | private void InitDB(SqliteConnection conn) | 755 | private static void InitDB(SqliteConnection conn) |
756 | { | 756 | { |
757 | string createUsers = SQLiteUtil.defineTable(createUsersTable()); | 757 | string createUsers = SQLiteUtil.defineTable(createUsersTable()); |
758 | string createFriends = SQLiteUtil.defineTable(createUserFriendsTable()); | 758 | string createFriends = SQLiteUtil.defineTable(createUserFriendsTable()); |
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; |