OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-14 05:33:32 +00:00
parent c995d60d37
commit 6a1b787436
28 changed files with 173 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/MapperFactory/DataMapperFactory.cs
View File

@ -41,7 +41,8 @@ namespace OpenSim.Data.MapperFactory
static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString) static public BaseDatabaseConnector GetDataBaseMapper(MAPPER_TYPE type, string connectionString)
{ {
switch (type) { switch (type)
{
case MAPPER_TYPE.MySQL: case MAPPER_TYPE.MySQL:
return new MySQLDatabaseMapper(connectionString); return new MySQLDatabaseMapper(connectionString);
case MAPPER_TYPE.MSSQL: case MAPPER_TYPE.MSSQL:

7
OpenSim/Data/MySQL/MySQLAssetData.cs
View File

@ -174,10 +174,13 @@ namespace OpenSim.Data.MySQL
{ {
// TODO: This will let you pass in the connect string in // TODO: This will let you pass in the connect string in
// the config, though someone will need to write that. // the config, though someone will need to write that.
if (connect == String.Empty) { if (connect == String.Empty)
{
// This is old seperate config file // This is old seperate config file
Initialise(); Initialise();
} else { }
else
{
_dbConnection = new MySQLManager(connect); _dbConnection = new MySQLManager(connect);
TestTables(); TestTables();
} }

3
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

@ -58,7 +58,8 @@ namespace OpenSim.Data.SQLite
override public void Initialise(string dbconnect) override public void Initialise(string dbconnect)
{ {
if (dbconnect == string.Empty) { if (dbconnect == string.Empty)
{
dbconnect = "URI=file:AssetStorage.db,version=3"; dbconnect = "URI=file:AssetStorage.db,version=3";
} }
m_conn = new SqliteConnection(dbconnect); m_conn = new SqliteConnection(dbconnect);

3
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

@ -52,7 +52,8 @@ namespace OpenSim.Data.SQLite
/// </summary> /// </summary>
public void Initialise(string dbconnect) public void Initialise(string dbconnect)
{ {
if (dbconnect == string.Empty) { if (dbconnect == string.Empty)
{
dbconnect = "URI=file:inventoryStore.db,version=3"; dbconnect = "URI=file:inventoryStore.db,version=3";
} }
m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect); m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);

2
OpenSim/Framework/PacketPool.cs
View File

@ -159,7 +159,7 @@ namespace OpenSim.Framework
return; // packet pool disabled return; // packet pool disabled
/* // Commented out to remove a compiler warning. :) /* // Commented out to remove a compiler warning. :)
lock(pool) lock (pool)
{ {
PacketType type=packet.Type; PacketType type=packet.Type;

10
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -372,8 +372,14 @@ namespace OpenSim.Framework.Servers
LLSD llsdRequest = null; LLSD llsdRequest = null;
LLSD llsdResponse = null; LLSD llsdResponse = null;
try { llsdRequest = LLSDParser.DeserializeXml(requestBody); } try
catch (Exception ex) { m_log.Warn("[HTTPD]: Error - " + ex.Message); } {
llsdRequest = LLSDParser.DeserializeXml(requestBody);
}
catch (Exception ex)
{
m_log.Warn("[HTTPD]: Error - " + ex.Message);
}
if (llsdRequest != null && m_llsdHandler != null) if (llsdRequest != null && m_llsdHandler != null)
{ {

3
OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
View File

@ -39,7 +39,8 @@ namespace OpenGridServices.Manager
protected virtual void OnResponse(object o, Gtk.ResponseArgs args) protected virtual void OnResponse(object o, Gtk.ResponseArgs args)
{ {
switch (args.ResponseId) { switch (args.ResponseId)
{
case Gtk.ResponseType.Ok: case Gtk.ResponseType.Ok:
MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text); MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text);
break; break;

28
OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
View File

@ -46,7 +46,8 @@ namespace OpenGridServices.Manager
public bool Connect(string GridServerURL, string username, string password) public bool Connect(string GridServerURL, string username, string password)
{ {
try { try
{
this.ServerURL=GridServerURL; this.ServerURL=GridServerURL;
Hashtable LoginParamsHT = new Hashtable(); Hashtable LoginParamsHT = new Hashtable();
LoginParamsHT["username"]=username; LoginParamsHT["username"]=username;
@ -55,16 +56,21 @@ namespace OpenGridServices.Manager
LoginParams.Add(LoginParamsHT); LoginParams.Add(LoginParamsHT);
XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams); XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000); XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
if (GridResp.IsFault) { if (GridResp.IsFault)
{
connected=false; connected=false;
return false; return false;
} else { }
else
{
Hashtable gridrespData = (Hashtable)GridResp.Value; Hashtable gridrespData = (Hashtable)GridResp.Value;
this.SessionID = new LLUUID((string)gridrespData["session_id"]); this.SessionID = new LLUUID((string)gridrespData["session_id"]);
connected=true; connected=true;
return true; return true;
} }
} catch(Exception e) { }
catch(Exception e)
{
Console.WriteLine(e.ToString()); Console.WriteLine(e.ToString());
connected=false; connected=false;
return false; return false;
@ -107,20 +113,26 @@ namespace OpenGridServices.Manager
public bool ShutdownServer() public bool ShutdownServer()
{ {
try { try
{
Hashtable ShutdownParamsHT = new Hashtable(); Hashtable ShutdownParamsHT = new Hashtable();
ArrayList ShutdownParams = new ArrayList(); ArrayList ShutdownParams = new ArrayList();
ShutdownParamsHT["session_id"]=this.SessionID.ToString(); ShutdownParamsHT["session_id"]=this.SessionID.ToString();
ShutdownParams.Add(ShutdownParamsHT); ShutdownParams.Add(ShutdownParamsHT);
XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams); XmlRpcRequest GridShutdownReq = new XmlRpcRequest("shutdown",ShutdownParams);
XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000); XmlRpcResponse GridResp = GridShutdownReq.Send(this.ServerURL, 3000);
if (GridResp.IsFault) { if (GridResp.IsFault)
{
return false; return false;
} else { }
else
{
connected=false; connected=false;
return true; return true;
} }
} catch(Exception e) { }
catch(Exception e)
{
Console.WriteLine(e.ToString()); Console.WriteLine(e.ToString());
return false; return false;
} }

32
OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
View File

@ -62,47 +62,57 @@ namespace OpenGridServices.Manager
operation=PendingOperations.Dequeue(); operation=PendingOperations.Dequeue();
Console.WriteLine(operation); Console.WriteLine(operation);
cmd = operation.Split(sep)[0]; cmd = operation.Split(sep)[0];
switch (cmd) { switch (cmd)
{
case "connect_to_gridserver": case "connect_to_gridserver":
win.SetStatus("Connecting to grid server..."); win.SetStatus("Connecting to grid server...");
if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3])) { if (gridserverConn.Connect(operation.Split(sep)[1], operation.Split(sep)[2], operation.Split(sep)[3]))
{
win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID); win.SetStatus("Connected OK with session ID:" + gridserverConn.SessionID);
win.SetGridServerConnected(true); win.SetGridServerConnected(true);
Thread.Sleep(3000); Thread.Sleep(3000);
win.SetStatus("Downloading region maps..."); win.SetStatus("Downloading region maps...");
gridserverConn.DownloadMap(); gridserverConn.DownloadMap();
} else { }
else
{
win.SetStatus("Could not connect"); win.SetStatus("Could not connect");
} }
break; break;
case "restart_gridserver": case "restart_gridserver":
win.SetStatus("Restarting grid server..."); win.SetStatus("Restarting grid server...");
if (gridserverConn.RestartServer()) { if (gridserverConn.RestartServer())
{
win.SetStatus("Restarted server OK"); win.SetStatus("Restarted server OK");
Thread.Sleep(3000); Thread.Sleep(3000);
win.SetStatus(""); win.SetStatus("");
} else { }
else
{
win.SetStatus("Error restarting grid server!!!"); win.SetStatus("Error restarting grid server!!!");
} }
break; break;
case "shutdown_gridserver": case "shutdown_gridserver":
win.SetStatus("Shutting down grid server..."); win.SetStatus("Shutting down grid server...");
if (gridserverConn.ShutdownServer()) { if (gridserverConn.ShutdownServer())
{
win.SetStatus("Grid server shutdown"); win.SetStatus("Grid server shutdown");
win.SetGridServerConnected(false); win.SetGridServerConnected(false);
Thread.Sleep(3000); Thread.Sleep(3000);
win.SetStatus(""); win.SetStatus("");
} else { }
else
{
win.SetStatus("Could not shutdown grid server!!!"); win.SetStatus("Could not shutdown grid server!!!");
} }
break; break;
case "disconnect_gridserver": case "disconnect_gridserver":
gridserverConn.DisconnectServer(); gridserverConn.DisconnectServer();
win.SetGridServerConnected(false); win.SetGridServerConnected(false);
break; break;
} }
} }
} }

2
OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Framework.Utilities
public static uint GetNextXferID() public static uint GetNextXferID()
{ {
uint id = 0; uint id = 0;
lock(XferLock) lock (XferLock)
{ {
id = nextXferID; id = nextXferID;
nextXferID++; nextXferID++;

27
OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
View File

@ -35,38 +35,26 @@
// </autogenerated> // </autogenerated>
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
namespace OpenGridServices.Manager { namespace OpenGridServices.Manager
{
public partial class ConnectToGridServerDialog
public partial class ConnectToGridServerDialog { {
private Gtk.VBox vbox2; private Gtk.VBox vbox2;
private Gtk.VBox vbox3; private Gtk.VBox vbox3;
private Gtk.HBox hbox1; private Gtk.HBox hbox1;
private Gtk.Label label1; private Gtk.Label label1;
private Gtk.Entry entry1; private Gtk.Entry entry1;
private Gtk.HBox hbox2; private Gtk.HBox hbox2;
private Gtk.Label label2; private Gtk.Label label2;
private Gtk.Entry entry2; private Gtk.Entry entry2;
private Gtk.HBox hbox3; private Gtk.HBox hbox3;
private Gtk.Label label3; private Gtk.Label label3;
private Gtk.Entry entry3; private Gtk.Entry entry3;
private Gtk.Button button2; private Gtk.Button button2;
private Gtk.Button button8; private Gtk.Button button8;
protected virtual void Build() { protected virtual void Build()
{
Stetic.Gui.Initialize(); Stetic.Gui.Initialize();
// Widget OpenGridServices.Manager.ConnectToGridServerDialog // Widget OpenGridServices.Manager.ConnectToGridServerDialog
this.Events = ((Gdk.EventMask)(256)); this.Events = ((Gdk.EventMask)(256));
@ -241,7 +229,8 @@ namespace OpenGridServices.Manager {
w31.Position = 1; w31.Position = 1;
w31.Expand = false; w31.Expand = false;
w31.Fill = false; w31.Fill = false;
if ((this.Child != null)) { if (this.Child != null)
{
this.Child.ShowAll(); this.Child.ShowAll();
} }
this.DefaultWidth = 476; this.DefaultWidth = 476;

49
OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
View File

@ -35,82 +35,48 @@
// </autogenerated> // </autogenerated>
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
namespace OpenGridServices.Manager { namespace OpenGridServices.Manager
{
public partial class MainWindow
public partial class MainWindow { {
private Gtk.Action Grid; private Gtk.Action Grid;
private Gtk.Action User; private Gtk.Action User;
private Gtk.Action Asset; private Gtk.Action Asset;
private Gtk.Action Region; private Gtk.Action Region;
private Gtk.Action Services; private Gtk.Action Services;
private Gtk.Action ConnectToGridserver; private Gtk.Action ConnectToGridserver;
private Gtk.Action RestartWholeGrid; private Gtk.Action RestartWholeGrid;
private Gtk.Action ShutdownWholeGrid; private Gtk.Action ShutdownWholeGrid;
private Gtk.Action ExitGridManager; private Gtk.Action ExitGridManager;
private Gtk.Action ConnectToUserserver; private Gtk.Action ConnectToUserserver;
private Gtk.Action AccountManagment; private Gtk.Action AccountManagment;
private Gtk.Action GlobalNotice; private Gtk.Action GlobalNotice;
private Gtk.Action DisableAllLogins; private Gtk.Action DisableAllLogins;
private Gtk.Action DisableNonGodUsersOnly; private Gtk.Action DisableNonGodUsersOnly;
private Gtk.Action ShutdownUserServer; private Gtk.Action ShutdownUserServer;
private Gtk.Action ShutdownGridserverOnly; private Gtk.Action ShutdownGridserverOnly;
private Gtk.Action RestartGridserverOnly; private Gtk.Action RestartGridserverOnly;
private Gtk.Action DefaultLocalGridUserserver; private Gtk.Action DefaultLocalGridUserserver;
private Gtk.Action CustomUserserver; private Gtk.Action CustomUserserver;
private Gtk.Action RemoteGridDefaultUserserver; private Gtk.Action RemoteGridDefaultUserserver;
private Gtk.Action DisconnectFromGridServer; private Gtk.Action DisconnectFromGridServer;
private Gtk.Action UploadAsset; private Gtk.Action UploadAsset;
private Gtk.Action AssetManagement; private Gtk.Action AssetManagement;
private Gtk.Action ConnectToAssetServer; private Gtk.Action ConnectToAssetServer;
private Gtk.Action ConnectToDefaultAssetServerForGrid; private Gtk.Action ConnectToDefaultAssetServerForGrid;
private Gtk.Action DefaultForLocalGrid; private Gtk.Action DefaultForLocalGrid;
private Gtk.Action DefaultForRemoteGrid; private Gtk.Action DefaultForRemoteGrid;
private Gtk.Action CustomAssetServer; private Gtk.Action CustomAssetServer;
private Gtk.VBox vbox1; private Gtk.VBox vbox1;
private Gtk.MenuBar menubar2; private Gtk.MenuBar menubar2;
private Gtk.HBox hbox1; private Gtk.HBox hbox1;
private Gtk.ScrolledWindow scrolledwindow1; private Gtk.ScrolledWindow scrolledwindow1;
private Gtk.DrawingArea drawingarea1; private Gtk.DrawingArea drawingarea1;
private Gtk.TreeView treeview1; private Gtk.TreeView treeview1;
private Gtk.Statusbar statusbar1; private Gtk.Statusbar statusbar1;
protected virtual void Build() { protected virtual void Build()
{
Stetic.Gui.Initialize(); Stetic.Gui.Initialize();
// Widget OpenGridServices.Manager.MainWindow // Widget OpenGridServices.Manager.MainWindow
Gtk.UIManager w1 = new Gtk.UIManager(); Gtk.UIManager w1 = new Gtk.UIManager();
@ -266,7 +232,8 @@ namespace OpenGridServices.Manager {
w10.Expand = false; w10.Expand = false;
w10.Fill = false; w10.Fill = false;
this.Add(this.vbox1); this.Add(this.vbox1);
if ((this.Child != null)) { if (this.Child != null)
{
this.Child.ShowAll(); this.Child.ShowAll();
} }
this.DefaultWidth = 800; this.DefaultWidth = 800;

26
OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
View File

@ -35,27 +35,27 @@
// </autogenerated> // </autogenerated>
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
namespace Stetic { namespace Stetic
{
internal class Gui
internal class Gui { {
private static bool initialized; private static bool initialized;
internal static void Initialize() { internal static void Initialize()
if ((Stetic.Gui.initialized == false)) { {
Stetic.Gui.initialized = true; Stetic.Gui.initialized = true;
}
} }
} }
internal class ActionGroups { internal class ActionGroups
{
public static Gtk.ActionGroup GetActionGroup(System.Type type) { public static Gtk.ActionGroup GetActionGroup(System.Type type)
{
return Stetic.ActionGroups.GetActionGroup(type.FullName); return Stetic.ActionGroups.GetActionGroup(type.FullName);
} }
public static Gtk.ActionGroup GetActionGroup(string name) { public static Gtk.ActionGroup GetActionGroup(string name)
{
return null; return null;
} }
} }

2
OpenSim/Grid/MessagingServer/MessageService.cs
View File

@ -234,7 +234,7 @@ namespace OpenSim.Grid.MessagingServer
for (int i = 0; i < AgentsNeedingNotification.Count; i++) for (int i = 0; i < AgentsNeedingNotification.Count; i++)
{ {
// TODO: Do Region Notifications // TODO: Do Region Notifications
lock(m_presences) lock (m_presences)
{ {
if (m_presences.Contains(AgentsNeedingNotification[i])) if (m_presences.Contains(AgentsNeedingNotification[i]))
{ {

7
OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass.cs
View File

@ -39,7 +39,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
public Dictionary<uint, object> GlobalVariables = new Dictionary<uint, object>(); public Dictionary<uint, object> GlobalVariables = new Dictionary<uint, object>();
public Dictionary<uint, object> LocalVariables = new Dictionary<uint, object>(); public Dictionary<uint, object> LocalVariables = new Dictionary<uint, object>();
//public System.Collections.Generic.List<string> FunctionList = new System.Collections.Generic.List<string>(); //public System.Collections.Generic.List<string> FunctionList = new System.Collections.Generic.List<string>();
//public void AddFunction(String x) { //public void AddFunction(String x)
//{
// FunctionList.Add(x); // FunctionList.Add(x);
//} //}
//public Stack<StackItemStruct> LSLStack = new Stack<StackItemStruct>; //public Stack<StackItemStruct> LSLStack = new Stack<StackItemStruct>;
@ -56,12 +57,10 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
return LSL_Builtins; return LSL_Builtins;
} }
public LSL_BaseClass() public LSL_BaseClass()
{ {
} }
public virtual int OverrideMe() public virtual int OverrideMe()
{ {
return 0; return 0;
@ -72,8 +71,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
LSL_Builtins = LSLBuiltins; LSL_Builtins = LSLBuiltins;
Common.SendToLog("OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass.Start() called"); Common.SendToLog("OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass.Start() called");
//LSL_Builtins.llSay(0, "Test");
return;
} }
public void AddToStatic(UInt32 index, object obj) public void AddToStatic(UInt32 index, object obj)

6
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -4601,13 +4601,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack; ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack;
handlerObjectIncludeInSearch = null; handlerObjectIncludeInSearch = null;
foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData) { foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData)
{
bool inSearch = objData.IncludeInSearch; bool inSearch = objData.IncludeInSearch;
uint localID = objData.ObjectLocalID; uint localID = objData.ObjectLocalID;
handlerObjectIncludeInSearch = OnObjectIncludeInSearch; handlerObjectIncludeInSearch = OnObjectIncludeInSearch;
if (handlerObjectIncludeInSearch != null) { if (handlerObjectIncludeInSearch != null)
{
handlerObjectIncludeInSearch(this, inSearch, localID); handlerObjectIncludeInSearch(this, inSearch, localID);
} }
} }

3
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@ -148,7 +148,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return; return;
} }
lock (this) { lock (this)
{
switch (item.throttleType) switch (item.throttleType)
{ {
case ThrottleOutPacketType.Resend: case ThrottleOutPacketType.Resend:

63
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@ -78,43 +78,47 @@ namespace OpenSim.Region.DataSnapshot
if (!m_scenes.Contains(scene)) if (!m_scenes.Contains(scene))
m_scenes.Add(scene); m_scenes.Add(scene);
if (!m_configLoaded) { if (!m_configLoaded)
{
m_configLoaded = true; m_configLoaded = true;
m_log.Info("[DATASNAPSHOT]: Loading configuration"); m_log.Info("[DATASNAPSHOT]: Loading configuration");
//Read from the config for options //Read from the config for options
lock (m_syncInit) { lock (m_syncInit)
try { {
m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); try
if (config.Configs["Startup"].GetBoolean("gridmode", true)) {
{ m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl")); if (config.Configs["Startup"].GetBoolean("gridmode", true))
m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl")); {
m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl")); m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl"));
} m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
else m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
{ }
//Non gridmode stuff else
} {
//Non gridmode stuff
}
m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl")); m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
m_maxSnapshots = config.Configs["DataSnapshot"].GetInt("max_snapshots", m_maxSnapshots); m_maxSnapshots = config.Configs["DataSnapshot"].GetInt("max_snapshots", m_maxSnapshots);
m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period); m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir); m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir);
m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices); m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port); m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port);
//BUG: Naming a search data module "DESUDESUDESU" will cause it to not get loaded by default. //BUG: Naming a search data module "DESUDESUDESU" will cause it to not get loaded by default.
//RESOLUTION: Wontfix, there are no Suiseiseki-loving developers //RESOLUTION: Wontfix, there are no Suiseiseki-loving developers
String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "DESUDESUDESU").Split(".".ToCharArray()); String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "DESUDESUDESU").Split(".".ToCharArray());
foreach (String bloody_wanker in annoying_string_array) { foreach (String bloody_wanker in annoying_string_array)
m_disabledModules.Add(bloody_wanker); {
} m_disabledModules.Add(bloody_wanker);
}
} catch (Exception) { }
catch (Exception)
{
m_log.Info("[DATASNAPSHOT]: Could not load configuration. DataSnapshot will be disabled."); m_log.Info("[DATASNAPSHOT]: Could not load configuration. DataSnapshot will be disabled.");
m_enabled = false; m_enabled = false;
return; return;
} }
} }
} }
if (Directory.Exists(m_snapsDir)) if (Directory.Exists(m_snapsDir))
@ -135,7 +139,6 @@ namespace OpenSim.Region.DataSnapshot
} }
} }
if (m_enabled) if (m_enabled)
{ {
m_log.Info("[DATASNAPSHOT]: Scene added to module."); m_log.Info("[DATASNAPSHOT]: Scene added to module.");

6
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -815,7 +815,8 @@ namespace OpenSim.Region.Environment.Scenes
agentItem.Folder = folderId; agentItem.Folder = folderId;
agentItem.EveryOnePermissions = taskItem.EveryoneMask; agentItem.EveryOnePermissions = taskItem.EveryoneMask;
if (remoteClient.AgentId != taskItem.OwnerID) { if (remoteClient.AgentId != taskItem.OwnerID)
{
agentItem.BasePermissions = taskItem.NextOwnerMask; agentItem.BasePermissions = taskItem.NextOwnerMask;
agentItem.CurrentPermissions = taskItem.NextOwnerMask; agentItem.CurrentPermissions = taskItem.NextOwnerMask;
agentItem.NextPermissions = taskItem.NextOwnerMask; agentItem.NextPermissions = taskItem.NextOwnerMask;
@ -1038,7 +1039,8 @@ namespace OpenSim.Region.Environment.Scenes
item.InvType = asset.InvType; item.InvType = asset.InvType;
item.Folder = DeRezPacket.AgentBlock.DestinationID; item.Folder = DeRezPacket.AgentBlock.DestinationID;
item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
if (remoteClient.AgentId != objectGroup.RootPart.OwnerID) { if (remoteClient.AgentId != objectGroup.RootPart.OwnerID)
{
item.BasePermissions = objectGroup.RootPart.NextOwnerMask; item.BasePermissions = objectGroup.RootPart.NextOwnerMask;
item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask; item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask;
item.NextPermissions = objectGroup.RootPart.NextOwnerMask; item.NextPermissions = objectGroup.RootPart.NextOwnerMask;

3
OpenSim/Region/Environment/Scenes/SceneEvents.cs
View File

@ -195,7 +195,8 @@ namespace OpenSim.Region.Environment.Scenes
public int transactiontype; public int transactiontype;
public string description; public string description;
public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription) { public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription)
{
sender = asender; sender = asender;
receiver = areceiver; receiver = areceiver;
amount = aamount; amount = aamount;

6
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -579,7 +579,8 @@ namespace OpenSim.Region.Physics.Meshing
if (pathShearX != 0) if (pathShearX != 0)
{ {
if (pathShearX > 50) { if (pathShearX > 50)
{
// Complimentary byte. Negative values wrap around the byte. Positive values go up to 50 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
extr.pushX = (((float)(256 - pathShearX) / 100) * -1f); extr.pushX = (((float)(256 - pathShearX) / 100) * -1f);
// m_log.Warn("pushX: " + extr.pushX); // m_log.Warn("pushX: " + extr.pushX);
@ -593,7 +594,8 @@ namespace OpenSim.Region.Physics.Meshing
if (pathShearY != 0) if (pathShearY != 0)
{ {
if (pathShearY > 50) { if (pathShearY > 50)
{
// Complimentary byte. Negative values wrap around the byte. Positive values go up to 50 // Complimentary byte. Negative values wrap around the byte. Positive values go up to 50
extr.pushY = (((float)(256 - pathShearY) / 100) * -1f); extr.pushY = (((float)(256 - pathShearY) / 100) * -1f);
//m_log.Warn("pushY: " + extr.pushY); //m_log.Warn("pushY: " + extr.pushY);

4
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -294,7 +294,7 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void waitForSpaceUnlock(IntPtr space) internal void waitForSpaceUnlock(IntPtr space)
{ {
//if (space != (IntPtr)0) //if (space != (IntPtr)0)
//while (d.SpaceLockQuery(space)){ } // Wait and do nothing //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
} }
/// <summary> /// <summary>
@ -952,7 +952,7 @@ namespace OpenSim.Region.Physics.OdePlugin
public void addCollisionEventReporting(PhysicsActor obj) public void addCollisionEventReporting(PhysicsActor obj)
{ {
lock(_collisionEventPrim) lock (_collisionEventPrim)
{ {
if (!_collisionEventPrim.Contains(obj)) if (!_collisionEventPrim.Contains(obj))
_collisionEventPrim.Add(obj); _collisionEventPrim.Add(obj);

11
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
View File

@ -207,7 +207,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
public void DoScriptLoadUnload() public void DoScriptLoadUnload()
{ {
lock (LUQueue) { lock (LUQueue)
{
if (LUQueue.Count > 0) if (LUQueue.Count > 0)
{ {
LUStruct item = LUQueue.Dequeue(); LUStruct item = LUQueue.Dequeue();
@ -216,7 +217,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
{ {
_StopScript(item.localID, item.itemID); _StopScript(item.localID, item.itemID);
} }
if (item.Action == LUType.Load) else if (item.Action == LUType.Load)
{ {
_StartScript(item.localID, item.itemID, item.script); _StartScript(item.localID, item.itemID, item.script);
} }
@ -249,7 +250,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
/// <param name="localID"></param> /// <param name="localID"></param>
public void StartScript(uint localID, LLUUID itemID, string Script) public void StartScript(uint localID, LLUUID itemID, string Script)
{ {
lock(LUQueue) { lock (LUQueue)
{
if (LUQueue.Count >= LoadUnloadMaxQueueSize) if (LUQueue.Count >= LoadUnloadMaxQueueSize)
{ {
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."); 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
ls.localID = localID; ls.localID = localID;
ls.itemID = itemID; ls.itemID = itemID;
ls.Action = LUType.Unload; ls.Action = LUType.Unload;
lock (LUQueue) { lock (LUQueue)
{
LUQueue.Enqueue(ls); LUQueue.Enqueue(ls);
} }
} }

3
OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Enums.cs
View File

@ -34,7 +34,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
{ {
//public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types; //public System.Collections.Generic.Dictionary<Byte, Type> OpCode_Add_Types;
//LSO_Enums() { //LSO_Enums()
//{
// OpCode_Add_Types.Add(51, typeof(String)); // OpCode_Add_Types.Add(51, typeof(String));
// OpCode_Add_Types.Add(17, typeof(UInt32)); // OpCode_Add_Types.Add(17, typeof(UInt32));
//} //}

8
OpenSim/TestSuite/Main.cs
View File

@ -44,7 +44,6 @@ namespace OpenSim.TestSuite
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
// TODO: config parser // TODO: config parser
// TODO: load tests from addings // TODO: load tests from addings
@ -52,9 +51,12 @@ namespace OpenSim.TestSuite
// TODO: create base bot cloud for use in tests // TODO: create base bot cloud for use in tests
IConfig config = ParseConfig(args); IConfig config = ParseConfig(args);
if (config.Get("help") != null || config.Get("loginuri") == null) { if (config.Get("help") != null || config.Get("loginuri") == null)
{
Help(); Help();
} else { }
else
{
// TODO: unused: int botcount = config.GetInt("botcount", 1); // TODO: unused: int botcount = config.GetInt("botcount", 1);
// BotManager bm = new BotManager(); // BotManager bm = new BotManager();

7
OpenSim/Tools/pCampBot/pCampBot.cs
View File

@ -47,9 +47,12 @@ namespace pCampBot
public static void Main(string[] args) public static void Main(string[] args)
{ {
IConfig config = ParseConfig(args); IConfig config = ParseConfig(args);
if (config.Get("help") != null || config.Get("loginuri") == null) { if (config.Get("help") != null || config.Get("loginuri") == null)
{
Help(); Help();
} else { }
else
{
int botcount = config.GetInt("botcount", 1); int botcount = config.GetInt("botcount", 1);
BotManager bm = new BotManager(); BotManager bm = new BotManager();

8
ThirdParty/3Di/LoadBalancer/TcpClient.cs vendored
View File

@ -181,8 +181,10 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
} }
/* /*
public void recevie() { public void receive()
if (mConnection == null) { {
if (mConnection == null)
{
throw new Exception("client not initialized"); throw new Exception("client not initialized");
} }
try try
@ -191,7 +193,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
} }
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine(e.ToString()); Console.WriteLine(e.ToString());
mConnection = null; mConnection = null;
} }
} }

3
ThirdParty/3Di/LoadBalancer/TcpServer.cs vendored
View File

@ -150,7 +150,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
state.ms_ptr.Read(packet, 0, state.header.numbytes); state.ms_ptr.Read(packet, 0, state.header.numbytes);
/* /*
for (int i=0; i<state.header.numbytes; i++) { for (int i=0; i<state.header.numbytes; i++)
{
System.Console.Write(packet[i] + " "); System.Console.Write(packet[i] + " ");
} }
System.Console.WriteLine(); System.Console.WriteLine();