aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MapperFactory/DataMapperFactory.cs3
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs7
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs3
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs3
-rw-r--r--OpenSim/Framework/PacketPool.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs10
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs3
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs28
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs32
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs2
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs27
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs49
-rw-r--r--OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs26
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs2
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass.cs7
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs3
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs65
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs3
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs11
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs3
-rw-r--r--OpenSim/TestSuite/Main.cs8
-rw-r--r--OpenSim/Tools/pCampBot/pCampBot.cs7
26 files changed, 167 insertions, 159 deletions
diff --git a/OpenSim/Data/MapperFactory/DataMapperFactory.cs b/OpenSim/Data/MapperFactory/DataMapperFactory.cs
index c447be7..1d981f8 100644
--- a/OpenSim/Data/MapperFactory/DataMapperFactory.cs
+++ b/OpenSim/Data/MapperFactory/DataMapperFactory.cs
@@ -41,7 +41,8 @@ namespace OpenSim.Data.MapperFactory
41 41
42 static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString) 42 static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString)
43 { 43 {
44 switch (type) { 44 switch (type)
45 {
45 case MAPPER_TYPE.MySQL: 46 case MAPPER_TYPE.MySQL:
46 return new MySQLDatabaseMapper(connectionString); 47 return new MySQLDatabaseMapper(connectionString);
47 case MAPPER_TYPE.MSSQL: 48 case MAPPER_TYPE.MSSQL:
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index efcf59e..7e6289b 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -174,10 +174,13 @@ namespace OpenSim.Data.MySQL
174 { 174 {
175 // TODO: This will let you pass in the connect string in 175 // TODO: This will let you pass in the connect string in
176 // the config, though someone will need to write that. 176 // the config, though someone will need to write that.
177 if (connect == String.Empty) { 177 if (connect == String.Empty)
178 {
178 // This is old seperate config file 179 // This is old seperate config file
179 Initialise(); 180 Initialise();
180 } else { 181 }
182 else
183 {
181 _dbConnection = new MySQLManager(connect); 184 _dbConnection = new MySQLManager(connect);
182 TestTables(); 185 TestTables();
183 } 186 }
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index f3a4bd1..34329bb 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -58,7 +58,8 @@ namespace OpenSim.Data.SQLite
58 58
59 override public void Initialise(string dbconnect) 59 override public void Initialise(string dbconnect)
60 { 60 {
61 if (dbconnect == string.Empty) { 61 if (dbconnect == string.Empty)
62 {
62 dbconnect = "URI=file:AssetStorage.db,version=3"; 63 dbconnect = "URI=file:AssetStorage.db,version=3";
63 } 64 }
64 m_conn = new SqliteConnection(dbconnect); 65 m_conn = new SqliteConnection(dbconnect);
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 40978da..1ab971c 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -52,7 +52,8 @@ namespace OpenSim.Data.SQLite
52 /// </summary> 52 /// </summary>
53 public void Initialise(string dbconnect) 53 public void Initialise(string dbconnect)
54 { 54 {
55 if (dbconnect == string.Empty) { 55 if (dbconnect == string.Empty)
56 {
56 dbconnect = "URI=file:inventoryStore.db,version=3"; 57 dbconnect = "URI=file:inventoryStore.db,version=3";
57 } 58 }
58 m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); 59 m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index af8efe8..4e71d5e 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Framework
159 return; // packet pool disabled 159 return; // packet pool disabled
160 160
161 /* // Commented out to remove a compiler warning. :) 161 /* // Commented out to remove a compiler warning. :)
162 lock(pool) 162 lock (pool)
163 { 163 {
164 PacketType type=packet.Type; 164 PacketType type=packet.Type;
165 165
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index f36b2fb..50f4e23 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -372,8 +372,14 @@ namespace OpenSim.Framework.Servers
372 LLSD llsdRequest = null; 372 LLSD llsdRequest = null;
373 LLSD llsdResponse = null; 373 LLSD llsdResponse = null;
374 374
375 try { llsdRequest = LLSDParser.DeserializeXml(requestBody); } 375 try
376 catch (Exception ex) { m_log.Warn("[HTTPD]: Error - " + ex.Message); } 376 {
377 llsdRequest = LLSDParser.DeserializeXml(requestBody);
378 }
379 catch (Exception ex)
380 {
381 m_log.Warn("[HTTPD]: Error - " + ex.Message);
382 }
377 383
378 if (llsdRequest != null && m_llsdHandler != null) 384 if (llsdRequest != null && m_llsdHandler != null)
379 { 385 {
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
index b6b2b64..210e195 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
@@ -39,7 +39,8 @@ 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 {
43 case Gtk.ResponseType.Ok: 44 case Gtk.ResponseType.Ok:
44 MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); 45 MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text);
45 break; 46 break;
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index a386fa8..cf44ac2 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
@@ -46,7 +46,8 @@ namespace OpenGridServices.Manager
46 46
47 public bool Connect(string GridServerURL, string username, string password) 47 public bool Connect(string GridServerURL, string username, string password)
48 { 48 {
49 try { 49 try
50 {
50 this.ServerURL=GridServerURL; 51 this.ServerURL=GridServerURL;
51 Hashtable LoginParamsHT = new Hashtable(); 52 Hashtable LoginParamsHT = new Hashtable();
52 LoginParamsHT["username"]=username; 53 LoginParamsHT["username"]=username;
@@ -55,16 +56,21 @@ namespace OpenGridServices.Manager
55 LoginParams.Add(LoginParamsHT); 56 LoginParams.Add(LoginParamsHT);
56 XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); 57 XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
57 XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); 58 XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
58 if (GridResp.IsFault) { 59 if (GridResp.IsFault)
60 {
59 connected=false; 61 connected=false;
60 return false; 62 return false;
61 } else { 63 }
64 else
65 {
62 Hashtable gridrespData = (Hashtable)GridResp.Value; 66 Hashtable gridrespData = (Hashtable)GridResp.Value;
63 this.SessionID = new LLUUID((string)gridrespData["session_id"]); 67 this.SessionID = new LLUUID((string)gridrespData["session_id"]);
64 connected=true; 68 connected=true;
65 return true; 69 return true;
66 } 70 }
67 } catch(Exception e) { 71 }
72 catch(Exception e)
73 {
68 Console.WriteLine(e.ToString()); 74 Console.WriteLine(e.ToString());
69 connected=false; 75 connected=false;
70 return false; 76 return false;
@@ -107,20 +113,26 @@ namespace OpenGridServices.Manager
107 113
108 public bool ShutdownServer() 114 public bool ShutdownServer()
109 { 115 {
110 try { 116 try
117 {
111 Hashtable ShutdownParamsHT = new Hashtable(); 118 Hashtable ShutdownParamsHT = new Hashtable();
112 ArrayList ShutdownParams = new ArrayList(); 119 ArrayList ShutdownParams = new ArrayList();
113 ShutdownParamsHT["session_id"]=this.SessionID.ToString(); 120 ShutdownParamsHT["session_id"]=this.SessionID.ToString();
114 ShutdownParams.Add(ShutdownParamsHT); 121 ShutdownParams.Add(ShutdownParamsHT);
115 XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); 122 XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams);
116 XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000); 123 XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000);
117 if (GridResp.IsFault) { 124 if (GridResp.IsFault)
125 {
118 return false; 126 return false;
119 } else { 127 }
128 else
129 {
120 connected=false; 130 connected=false;
121 return true; 131 return true;
122 } 132 }
123 } catch(Exception e) { 133 }
134 catch(Exception e)
135 {
124 Console.WriteLine(e.ToString()); 136 Console.WriteLine(e.ToString());
125 return false; 137 return false;
126 } 138 }
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
index 6b7a5ab..7700229 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
@@ -62,47 +62,57 @@ namespace OpenGridServices.Manager
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 {
66 case "connect_to_gridserver": 67 case "connect_to_gridserver":
67 win.SetStatus("Connecting to grid server..."); 68 win.SetStatus("Connecting to grid server...");
68 if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3])) { 69 if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3]))
70 {
69 win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); 71 win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID);
70 win.SetGridServerConnected(true); 72 win.SetGridServerConnected(true);
71 Thread.Sleep(3000); 73 Thread.Sleep(3000);
72 win.SetStatus("Downloading region maps..."); 74 win.SetStatus("Downloading region maps...");
73 gridserverConn.DownloadMap(); 75 gridserverConn.DownloadMap();
74 } else { 76 }
77 else
78 {
75 win.SetStatus("Could not connect"); 79 win.SetStatus("Could not connect");
76 } 80 }
77 break; 81 break;
78 82
79 case "restart_gridserver": 83 case "restart_gridserver":
80 win.SetStatus("Restarting grid server..."); 84 win.SetStatus("Restarting grid server...");
81 if (gridserverConn.RestartServer()) { 85 if (gridserverConn.RestartServer())
86 {
82 win.SetStatus("Restarted server OK"); 87 win.SetStatus("Restarted server OK");
83 Thread.Sleep(3000); 88 Thread.Sleep(3000);
84 win.SetStatus(""); 89 win.SetStatus("");
85 } else { 90 }
91 else
92 {
86 win.SetStatus("Error restarting grid server!!!"); 93 win.SetStatus("Error restarting grid server!!!");
87 } 94 }
88 break; 95 break;
89 96
90 case "shutdown_gridserver": 97 case "shutdown_gridserver":
91 win.SetStatus("Shutting down grid server..."); 98 win.SetStatus("Shutting down grid server...");
92 if (gridserverConn.ShutdownServer()) { 99 if (gridserverConn.ShutdownServer())
100 {
93 win.SetStatus("Grid server shutdown"); 101 win.SetStatus("Grid server shutdown");
94 win.SetGridServerConnected(false); 102 win.SetGridServerConnected(false);
95 Thread.Sleep(3000); 103 Thread.Sleep(3000);
96 win.SetStatus(""); 104 win.SetStatus("");
97 } else { 105 }
106 else
107 {
98 win.SetStatus("Could not shutdown grid server!!!"); 108 win.SetStatus("Could not shutdown grid server!!!");
99 } 109 }
100 break; 110 break;
101 111
102 case "disconnect_gridserver": 112 case "disconnect_gridserver":
103 gridserverConn.DisconnectServer(); 113 gridserverConn.DisconnectServer();
104 win.SetGridServerConnected(false); 114 win.SetGridServerConnected(false);
105 break; 115 break;
106 } 116 }
107 } 117 }
108 } 118 }
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
index fcc5574..aff4719 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Utilities
55 public static uint GetNextXferID() 55 public static uint GetNextXferID()
56 { 56 {
57 uint id = 0; 57 uint id = 0;
58 lock(XferLock) 58 lock (XferLock)
59 { 59 {
60 id = nextXferID; 60 id = nextXferID;
61 nextXferID++; 61 nextXferID++;
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 d082a3b..a5a4ec8 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
@@ -35,38 +35,26 @@
35// </autogenerated> 35// </autogenerated>
36// ------------------------------------------------------------------------------ 36// ------------------------------------------------------------------------------
37 37
38namespace OpenGridServices.Manager { 38namespace OpenGridServices.Manager
39 39{
40 40 public partial class ConnectToGridServerDialog
41 public partial class ConnectToGridServerDialog { 41 {
42
43 private Gtk.VBox vbox2; 42 private Gtk.VBox vbox2;
44
45 private Gtk.VBox vbox3; 43 private Gtk.VBox vbox3;
46
47 private Gtk.HBox hbox1; 44 private Gtk.HBox hbox1;
48
49 private Gtk.Label label1; 45 private Gtk.Label label1;
50
51 private Gtk.Entry entry1; 46 private Gtk.Entry entry1;
52
53 private Gtk.HBox hbox2; 47 private Gtk.HBox hbox2;
54
55 private Gtk.Label label2; 48 private Gtk.Label label2;
56
57 private Gtk.Entry entry2; 49 private Gtk.Entry entry2;
58
59 private Gtk.HBox hbox3; 50 private Gtk.HBox hbox3;
60
61 private Gtk.Label label3; 51 private Gtk.Label label3;
62
63 private Gtk.Entry entry3; 52 private Gtk.Entry entry3;
64
65 private Gtk.Button button2; 53 private Gtk.Button button2;
66
67 private Gtk.Button button8; 54 private Gtk.Button button8;
68 55
69 protected virtual void Build() { 56 protected virtual void Build()
57 {
70 Stetic.Gui.Initialize(); 58 Stetic.Gui.Initialize();
71 // Widget OpenGridServices.Manager.ConnectToGridServerDialog 59 // Widget OpenGridServices.Manager.ConnectToGridServerDialog
72 this.Events = ((Gdk.EventMask)(256)); 60 this.Events = ((Gdk.EventMask)(256));
@@ -241,7 +229,8 @@ namespace OpenGridServices.Manager {
241 w31.Position = 1; 229 w31.Position = 1;
242 w31.Expand = false; 230 w31.Expand = false;
243 w31.Fill = false; 231 w31.Fill = false;
244 if ((this.Child != null)) { 232 if (this.Child != null)
233 {
245 this.Child.ShowAll(); 234 this.Child.ShowAll();
246 } 235 }
247 this.DefaultWidth = 476; 236 this.DefaultWidth = 476;
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 9d3cdaf..9707aee 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
@@ -35,82 +35,48 @@
35// </autogenerated> 35// </autogenerated>
36// ------------------------------------------------------------------------------ 36// ------------------------------------------------------------------------------
37 37
38namespace OpenGridServices.Manager { 38namespace OpenGridServices.Manager
39 39{
40 40 public partial class MainWindow
41 public partial class MainWindow { 41 {
42
43 private Gtk.Action Grid; 42 private Gtk.Action Grid;
44
45 private Gtk.Action User; 43 private Gtk.Action User;
46
47 private Gtk.Action Asset; 44 private Gtk.Action Asset;
48
49 private Gtk.Action Region; 45 private Gtk.Action Region;
50
51 private Gtk.Action Services; 46 private Gtk.Action Services;
52
53 private Gtk.Action ConnectToGridserver; 47 private Gtk.Action ConnectToGridserver;
54
55 private Gtk.Action RestartWholeGrid; 48 private Gtk.Action RestartWholeGrid;
56
57 private Gtk.Action ShutdownWholeGrid; 49 private Gtk.Action ShutdownWholeGrid;
58
59 private Gtk.Action ExitGridManager; 50 private Gtk.Action ExitGridManager;
60
61 private Gtk.Action ConnectToUserserver; 51 private Gtk.Action ConnectToUserserver;
62
63 private Gtk.Action AccountManagment; 52 private Gtk.Action AccountManagment;
64
65 private Gtk.Action GlobalNotice; 53 private Gtk.Action GlobalNotice;
66
67 private Gtk.Action DisableAllLogins; 54 private Gtk.Action DisableAllLogins;
68
69 private Gtk.Action DisableNonGodUsersOnly; 55 private Gtk.Action DisableNonGodUsersOnly;
70
71 private Gtk.Action ShutdownUserServer; 56 private Gtk.Action ShutdownUserServer;
72
73 private Gtk.Action ShutdownGridserverOnly; 57 private Gtk.Action ShutdownGridserverOnly;
74
75 private Gtk.Action RestartGridserverOnly; 58 private Gtk.Action RestartGridserverOnly;
76
77 private Gtk.Action DefaultLocalGridUserserver; 59 private Gtk.Action DefaultLocalGridUserserver;
78
79 private Gtk.Action CustomUserserver; 60 private Gtk.Action CustomUserserver;
80
81 private Gtk.Action RemoteGridDefaultUserserver; 61 private Gtk.Action RemoteGridDefaultUserserver;
82
83 private Gtk.Action DisconnectFromGridServer; 62 private Gtk.Action DisconnectFromGridServer;
84
85 private Gtk.Action UploadAsset; 63 private Gtk.Action UploadAsset;
86
87 private Gtk.Action AssetManagement; 64 private Gtk.Action AssetManagement;
88
89 private Gtk.Action ConnectToAssetServer; 65 private Gtk.Action ConnectToAssetServer;
90
91 private Gtk.Action ConnectToDefaultAssetServerForGrid; 66 private Gtk.Action ConnectToDefaultAssetServerForGrid;
92
93 private Gtk.Action DefaultForLocalGrid; 67 private Gtk.Action DefaultForLocalGrid;
94
95 private Gtk.Action DefaultForRemoteGrid; 68 private Gtk.Action DefaultForRemoteGrid;
96
97 private Gtk.Action CustomAssetServer; 69 private Gtk.Action CustomAssetServer;
98
99 private Gtk.VBox vbox1; 70 private Gtk.VBox vbox1;
100
101 private Gtk.MenuBar menubar2; 71 private Gtk.MenuBar menubar2;
102
103 private Gtk.HBox hbox1; 72 private Gtk.HBox hbox1;
104
105 private Gtk.ScrolledWindow scrolledwindow1; 73 private Gtk.ScrolledWindow scrolledwindow1;
106
107 private Gtk.DrawingArea drawingarea1; 74 private Gtk.DrawingArea drawingarea1;
108
109 private Gtk.TreeView treeview1; 75 private Gtk.TreeView treeview1;
110
111 private Gtk.Statusbar statusbar1; 76 private Gtk.Statusbar statusbar1;
112 77
113 protected virtual void Build() { 78 protected virtual void Build()
79 {
114 Stetic.Gui.Initialize(); 80 Stetic.Gui.Initialize();
115 // Widget OpenGridServices.Manager.MainWindow 81 // Widget OpenGridServices.Manager.MainWindow
116 Gtk.UIManager w1 = new Gtk.UIManager(); 82 Gtk.UIManager w1 = new Gtk.UIManager();
@@ -266,7 +232,8 @@ namespace OpenGridServices.Manager {
266 w10.Expand = false; 232 w10.Expand = false;
267 w10.Fill = false; 233 w10.Fill = false;
268 this.Add(this.vbox1); 234 this.Add(this.vbox1);
269 if ((this.Child != null)) { 235 if (this.Child != null)
236 {
270 this.Child.ShowAll(); 237 this.Child.ShowAll();
271 } 238 }
272 this.DefaultWidth = 800; 239 this.DefaultWidth = 800;
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
index b297b16..46dec05 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
@@ -35,27 +35,27 @@
35// </autogenerated> 35// </autogenerated>
36// ------------------------------------------------------------------------------ 36// ------------------------------------------------------------------------------
37 37
38namespace Stetic { 38namespace Stetic
39 39{
40 40 internal class Gui
41 internal class Gui { 41 {
42
43 private static bool initialized; 42 private static bool initialized;
44 43
45 internal static void Initialize() { 44 internal static void Initialize()
46 if ((Stetic.Gui.initialized == false)) { 45 {
47 Stetic.Gui.initialized = true; 46 Stetic.Gui.initialized = true;
48 }
49 } 47 }
50 } 48 }
51 49
52 internal class ActionGroups { 50 internal class ActionGroups
53 51 {
54 public static Gtk.ActionGroup GetActionGroup(System.Type type) { 52 public static Gtk.ActionGroup GetActionGroup(System.Type type)
53 {
55 return Stetic.ActionGroups.GetActionGroup(type.FullName); 54 return Stetic.ActionGroups.GetActionGroup(type.FullName);
56 } 55 }
57 56
58 public static Gtk.ActionGroup GetActionGroup(string name) { 57 public static Gtk.ActionGroup GetActionGroup(string name)
58 {
59 return null; 59 return null;
60 } 60 }
61 } 61 }
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 50e06af..f9f3669 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Grid.MessagingServer
234 for (int i = 0; i < AgentsNeedingNotification.Count; i++) 234 for (int i = 0; i < AgentsNeedingNotification.Count; i++)
235 { 235 {
236 // TODO: Do Region Notifications 236 // TODO: Do Region Notifications
237 lock(m_presences) 237 lock (m_presences)
238 { 238 {
239 if (m_presences.Contains(AgentsNeedingNotification[i])) 239 if (m_presences.Contains(AgentsNeedingNotification[i]))
240 { 240 {
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass.cs
index 1c432f2..fd81f30 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass.cs
@@ -39,7 +39,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
39 public Dictionary<uint, object> GlobalVariables = new Dictionary<uint, object>(); 39 public Dictionary<uint, object> GlobalVariables = new Dictionary<uint, object>();
40 public Dictionary<uint, object> LocalVariables = new Dictionary<uint, object>(); 40 public Dictionary<uint, object> LocalVariables = new Dictionary<uint, object>();
41 //public System.Collections.Generic.List<string> FunctionList = new System.Collections.Generic.List<string>(); 41 //public System.Collections.Generic.List<string> FunctionList = new System.Collections.Generic.List<string>();
42 //public void AddFunction(String x) { 42 //public void AddFunction(String x)
43 //{
43 // FunctionList.Add(x); 44 // FunctionList.Add(x);
44 //} 45 //}
45 //public Stack<StackItemStruct> LSLStack = new Stack<StackItemStruct>; 46 //public Stack<StackItemStruct> LSLStack = new Stack<StackItemStruct>;
@@ -56,12 +57,10 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
56 return LSL_Builtins; 57 return LSL_Builtins;
57 } 58 }
58 59
59
60 public LSL_BaseClass() 60 public LSL_BaseClass()
61 { 61 {
62 } 62 }
63 63
64
65 public virtual int OverrideMe() 64 public virtual int OverrideMe()
66 { 65 {
67 return 0; 66 return 0;
@@ -72,8 +71,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
72 LSL_Builtins = LSLBuiltins; 71 LSL_Builtins = LSLBuiltins;
73 72
74 Common.SendToLog("OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass.Start() called"); 73 Common.SendToLog("OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass.Start() called");
75 //LSL_Builtins.llSay(0, "Test");
76 return;
77 } 74 }
78 75
79 public void AddToStatic(UInt32 index, object obj) 76 public void AddToStatic(UInt32 index, object obj)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index af20687..32432b4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4601,13 +4601,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4601 ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack; 4601 ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack;
4602 handlerObjectIncludeInSearch = null; 4602 handlerObjectIncludeInSearch = null;
4603 4603
4604 foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData) { 4604 foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData)
4605 {
4605 bool inSearch = objData.IncludeInSearch; 4606 bool inSearch = objData.IncludeInSearch;
4606 uint localID = objData.ObjectLocalID; 4607 uint localID = objData.ObjectLocalID;
4607 4608
4608 handlerObjectIncludeInSearch = OnObjectIncludeInSearch; 4609 handlerObjectIncludeInSearch = OnObjectIncludeInSearch;
4609 4610
4610 if (handlerObjectIncludeInSearch != null) { 4611 if (handlerObjectIncludeInSearch != null)
4612 {
4611 handlerObjectIncludeInSearch(this, inSearch, localID); 4613 handlerObjectIncludeInSearch(this, inSearch, localID);
4612 } 4614 }
4613 } 4615 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index c6da96e..8f90f34 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
148 return; 148 return;
149 } 149 }
150 150
151 lock (this) { 151 lock (this)
152 {
152 switch (item.throttleType) 153 switch (item.throttleType)
153 { 154 {
154 case ThrottleOutPacketType.Resend: 155 case ThrottleOutPacketType.Resend:
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 245922c..5831ddc 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -78,43 +78,47 @@ namespace OpenSim.Region.DataSnapshot
78 if (!m_scenes.Contains(scene)) 78 if (!m_scenes.Contains(scene))
79 m_scenes.Add(scene); 79 m_scenes.Add(scene);
80 80
81 if (!m_configLoaded) { 81 if (!m_configLoaded)
82 {
82 m_configLoaded = true; 83 m_configLoaded = true;
83 m_log.Info("[DATASNAPSHOT]: Loading configuration"); 84 m_log.Info("[DATASNAPSHOT]: Loading configuration");
84 //Read from the config for options 85 //Read from the config for options
85 lock (m_syncInit) { 86 lock (m_syncInit)
86 try { 87 {
87 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); 88 try
88 if (config.Configs["Startup"].GetBoolean("gridmode", true)) 89 {
89 { 90 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
90 m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl")); 91 if (config.Configs["Startup"].GetBoolean("gridmode", true))
91 m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl")); 92 {
92 m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl")); 93 m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl"));
93 } 94 m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
94 else 95 m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
95 { 96 }
96 //Non gridmode stuff 97 else
97 } 98 {
98 99 //Non gridmode stuff
99 m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl")); 100 }
100 m_maxSnapshots = config.Configs["DataSnapshot"].GetInt("max_snapshots", m_maxSnapshots); 101
101 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period); 102 m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
102 m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir); 103 m_maxSnapshots = config.Configs["DataSnapshot"].GetInt("max_snapshots", m_maxSnapshots);
103 m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices); 104 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
104 m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port); 105 m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir);
105 //BUG: Naming a search data module "DESUDESUDESU" will cause it to not get loaded by default. 106 m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
106 //RESOLUTION: Wontfix, there are no Suiseiseki-loving developers 107 m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port);
107 String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "DESUDESUDESU").Split(".".ToCharArray()); 108 //BUG: Naming a search data module "DESUDESUDESU" will cause it to not get loaded by default.
108 foreach (String bloody_wanker in annoying_string_array) { 109 //RESOLUTION: Wontfix, there are no Suiseiseki-loving developers
109 m_disabledModules.Add(bloody_wanker); 110 String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "DESUDESUDESU").Split(".".ToCharArray());
110 } 111 foreach (String bloody_wanker in annoying_string_array)
111 112 {
112 } catch (Exception) { 113 m_disabledModules.Add(bloody_wanker);
114 }
115 }
116 catch (Exception)
117 {
113 m_log.Info("[DATASNAPSHOT]: Could not load configuration. DataSnapshot will be disabled."); 118 m_log.Info("[DATASNAPSHOT]: Could not load configuration. DataSnapshot will be disabled.");
114 m_enabled = false; 119 m_enabled = false;
115 return; 120 return;
116 } 121 }
117
118 } 122 }
119 } 123 }
120 if (Directory.Exists(m_snapsDir)) 124 if (Directory.Exists(m_snapsDir))
@@ -135,7 +139,6 @@ namespace OpenSim.Region.DataSnapshot
135 } 139 }
136 } 140 }
137 141
138
139 if (m_enabled) 142 if (m_enabled)
140 { 143 {
141 m_log.Info("[DATASNAPSHOT]: Scene added to module."); 144 m_log.Info("[DATASNAPSHOT]: Scene added to module.");
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index efd258d..82a6b94 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -815,7 +815,8 @@ namespace OpenSim.Region.Environment.Scenes
815 agentItem.Folder = folderId; 815 agentItem.Folder = folderId;
816 agentItem.EveryOnePermissions = taskItem.EveryoneMask; 816 agentItem.EveryOnePermissions = taskItem.EveryoneMask;
817 817
818 if (remoteClient.AgentId != taskItem.OwnerID) { 818 if (remoteClient.AgentId != taskItem.OwnerID)
819 {
819 agentItem.BasePermissions = taskItem.NextOwnerMask; 820 agentItem.BasePermissions = taskItem.NextOwnerMask;
820 agentItem.CurrentPermissions = taskItem.NextOwnerMask; 821 agentItem.CurrentPermissions = taskItem.NextOwnerMask;
821 agentItem.NextPermissions = taskItem.NextOwnerMask; 822 agentItem.NextPermissions = taskItem.NextOwnerMask;
@@ -1038,7 +1039,8 @@ namespace OpenSim.Region.Environment.Scenes
1038 item.InvType = asset.InvType; 1039 item.InvType = asset.InvType;
1039 item.Folder = DeRezPacket.AgentBlock.DestinationID; 1040 item.Folder = DeRezPacket.AgentBlock.DestinationID;
1040 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; 1041 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
1041 if (remoteClient.AgentId != objectGroup.RootPart.OwnerID) { 1042 if (remoteClient.AgentId != objectGroup.RootPart.OwnerID)
1043 {
1042 item.BasePermissions = objectGroup.RootPart.NextOwnerMask; 1044 item.BasePermissions = objectGroup.RootPart.NextOwnerMask;
1043 item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask; 1045 item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask;
1044 item.NextPermissions = objectGroup.RootPart.NextOwnerMask; 1046 item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 88537e9..dacd609 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -195,7 +195,8 @@ namespace OpenSim.Region.Environment.Scenes
195 public int transactiontype; 195 public int transactiontype;
196 public string description; 196 public string description;
197 197
198 public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription) { 198 public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription)
199 {
199 sender = asender; 200 sender = asender;
200 receiver = areceiver; 201 receiver = areceiver;
201 amount = aamount; 202 amount = aamount;
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 5008927..2e7ec15 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -579,7 +579,8 @@ namespace OpenSim.Region.Physics.Meshing
579 579
580 if (pathShearX != 0) 580 if (pathShearX != 0)
581 { 581 {
582 if (pathShearX > 50) { 582 if (pathShearX > 50)
583 {
583 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50 584 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
584 extr.pushX = (((float)(256 - pathShearX) / 100) * -1f); 585 extr.pushX = (((float)(256 - pathShearX) / 100) * -1f);
585 // m_log.Warn("pushX: " + extr.pushX); 586 // m_log.Warn("pushX: " + extr.pushX);
@@ -593,7 +594,8 @@ namespace OpenSim.Region.Physics.Meshing
593 594
594 if (pathShearY != 0) 595 if (pathShearY != 0)
595 { 596 {
596 if (pathShearY > 50) { 597 if (pathShearY > 50)
598 {
597 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50 599 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
598 extr.pushY = (((float)(256 - pathShearY) / 100) * -1f); 600 extr.pushY = (((float)(256 - pathShearY) / 100) * -1f);
599 //m_log.Warn("pushY: " + extr.pushY); 601 //m_log.Warn("pushY: " + extr.pushY);
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index a54523b..c2a1c8e 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.Physics.OdePlugin
294 internal void waitForSpaceUnlock(IntPtr space) 294 internal void waitForSpaceUnlock(IntPtr space)
295 { 295 {
296 //if (space != (IntPtr)0) 296 //if (space != (IntPtr)0)
297 //while (d.SpaceLockQuery(space)){ } // Wait and do nothing 297 //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
298 } 298 }
299 299
300 /// <summary> 300 /// <summary>
@@ -952,7 +952,7 @@ namespace OpenSim.Region.Physics.OdePlugin
952 952
953 public void addCollisionEventReporting(PhysicsActor obj) 953 public void addCollisionEventReporting(PhysicsActor obj)
954 { 954 {
955 lock(_collisionEventPrim) 955 lock (_collisionEventPrim)
956 { 956 {
957 if (!_collisionEventPrim.Contains(obj)) 957 if (!_collisionEventPrim.Contains(obj))
958 _collisionEventPrim.Add(obj); 958 _collisionEventPrim.Add(obj);
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index da30535..2233913 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -207,7 +207,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
207 207
208 public void DoScriptLoadUnload() 208 public void DoScriptLoadUnload()
209 { 209 {
210 lock (LUQueue) { 210 lock (LUQueue)
211 {
211 if (LUQueue.Count > 0) 212 if (LUQueue.Count > 0)
212 { 213 {
213 LUStruct item = LUQueue.Dequeue(); 214 LUStruct item = LUQueue.Dequeue();
@@ -216,7 +217,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
216 { 217 {
217 _StopScript(item.localID, item.itemID); 218 _StopScript(item.localID, item.itemID);
218 } 219 }
219 if (item.Action == LUType.Load) 220 else if (item.Action == LUType.Load)
220 { 221 {
221 _StartScript(item.localID, item.itemID, item.script); 222 _StartScript(item.localID, item.itemID, item.script);
222 } 223 }
@@ -249,7 +250,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
249 /// <param name="localID"></param> 250 /// <param name="localID"></param>
250 public void StartScript(uint localID, LLUUID itemID, string Script) 251 public void StartScript(uint localID, LLUUID itemID, string Script)
251 { 252 {
252 lock(LUQueue) { 253 lock (LUQueue)
254 {
253 if (LUQueue.Count >= LoadUnloadMaxQueueSize) 255 if (LUQueue.Count >= LoadUnloadMaxQueueSize)
254 { 256 {
255 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: ERROR: Load/unload queue item count is at " + LUQueue.Count + ". Config variable \"LoadUnloadMaxQueueSize\" is set to " + LoadUnloadMaxQueueSize + ", so ignoring new script."); 257 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: ERROR: Load/unload queue item count is at " + LUQueue.Count + ". Config variable \"LoadUnloadMaxQueueSize\" is set to " + LoadUnloadMaxQueueSize + ", so ignoring new script.");
@@ -276,7 +278,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
276 ls.localID = localID; 278 ls.localID = localID;
277 ls.itemID = itemID; 279 ls.itemID = itemID;
278 ls.Action = LUType.Unload; 280 ls.Action = LUType.Unload;
279 lock (LUQueue) { 281 lock (LUQueue)
282 {
280 LUQueue.Enqueue(ls); 283 LUQueue.Enqueue(ls);
281 } 284 }
282 } 285 }
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
index 7b4a1af..c721267 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
@@ -34,7 +34,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
34 { 34 {
35 //public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types; 35 //public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types;
36 36
37 //LSO_Enums() { 37 //LSO_Enums()
38 //{
38 // OpCode_Add_Types.Add(51, typeof(String)); 39 // OpCode_Add_Types.Add(51, typeof(String));
39 // OpCode_Add_Types.Add(17, typeof(UInt32)); 40 // OpCode_Add_Types.Add(17, typeof(UInt32));
40 //} 41 //}
diff --git a/OpenSim/TestSuite/Main.cs b/OpenSim/TestSuite/Main.cs
index 213f02c..1a9aa0e 100644
--- a/OpenSim/TestSuite/Main.cs
+++ b/OpenSim/TestSuite/Main.cs
@@ -44,7 +44,6 @@ namespace OpenSim.TestSuite
44 { 44 {
45 public static void Main(string[] args) 45 public static void Main(string[] args)
46 { 46 {
47
48 // TODO: config parser 47 // TODO: config parser
49 48
50 // TODO: load tests from addings 49 // TODO: load tests from addings
@@ -52,9 +51,12 @@ namespace OpenSim.TestSuite
52 // TODO: create base bot cloud for use in tests 51 // TODO: create base bot cloud for use in tests
53 52
54 IConfig config = ParseConfig(args); 53 IConfig config = ParseConfig(args);
55 if (config.Get("help") != null || config.Get("loginuri") == null) { 54 if (config.Get("help") != null || config.Get("loginuri") == null)
55 {
56 Help(); 56 Help();
57 } else { 57 }
58 else
59 {
58 // TODO: unused: int botcount = config.GetInt("botcount", 1); 60 // TODO: unused: int botcount = config.GetInt("botcount", 1);
59 61
60 // BotManager bm = new BotManager(); 62 // BotManager bm = new BotManager();
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index d944608..81ec2b2 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -47,9 +47,12 @@ namespace pCampBot
47 public static void Main(string[] args) 47 public static void Main(string[] args)
48 { 48 {
49 IConfig config = ParseConfig(args); 49 IConfig config = ParseConfig(args);
50 if (config.Get("help") != null || config.Get("loginuri") == null) { 50 if (config.Get("help") != null || config.Get("loginuri") == null)
51 {
51 Help(); 52 Help();
52 } else { 53 }
54 else
55 {
53 int botcount = config.GetInt("botcount", 1); 56 int botcount = config.GetInt("botcount", 1);
54 57
55 BotManager bm = new BotManager(); 58 BotManager bm = new BotManager();
generated by cgit v1.1 at 2024-11-06 04:08:41 +0000