From 73599c0f25f67b6a2de61a36849bb8ce0b7b5279 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 6 Dec 2007 18:17:44 +0000
Subject: removed obsolete Verbose() function
---
OpenSim/Framework/Console/LogBase.cs | 15 --
OpenSim/Grid/GridServer.Config/DbGridConfig.cs | 135 +++++++++--------
OpenSim/Grid/UserServer.Config/DbUserConfig.cs | 164 +++++++++++----------
OpenSim/Region/Application/IApplicationPlugin.cs | 31 +++-
OpenSim/Region/Application/OpenSimMain.cs | 27 ++--
OpenSim/Region/ClientStack/ClientView.cs | 8 +-
OpenSim/Region/Environment/Scenes/InnerScene.cs | 18 +--
.../Region/Environment/Scenes/Scene.Inventory.cs | 2 +-
.../Environment/Scenes/ScenePresence.Animations.cs | 4 +-
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 3 +
OpenSim/Region/ExtensionsScriptModule/Script.cs | 2 +-
11 files changed, 215 insertions(+), 194 deletions(-)
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index c226fcb..045970e 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -164,21 +164,6 @@ namespace OpenSim.Framework.Console
}
///
- /// Sends a informational message to the current log output
- ///
- /// The message to send
- /// WriteLine-style message arguments
- [Obsolete("Please tag your console messages with the location your calling from")]
- public void Verbose(string format, params object[] args)
- {
- if (m_verbose)
- {
- WriteNewLine(ConsoleColor.Gray, format, args);
- return;
- }
- }
-
- ///
/// Sends an informational message to the current log output
///
/// The module that sent this message
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
index 050df83..c04132a 100644
--- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
+++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs
@@ -36,126 +36,135 @@ namespace OpenGrid.Config.GridConfigDb4o
///
/// A grid configuration interface for returning the DB4o Config Provider
///
- public class Db40ConfigPlugin: IGridConfig
- {
+ public class Db40ConfigPlugin: IGridConfig
+ {
///
/// Loads and returns a configuration objeect
///
/// A grid configuration object
- public GridConfig GetConfigObject()
- {
- MainLog.Instance.Verbose("Loading Db40Config dll");
- return ( new DbGridConfig());
- }
- }
+ public GridConfig GetConfigObject()
+ {
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Loading Db40Config dll");
+ return new DbGridConfig();
+ }
+ }
///
/// A DB4o based Gridserver configuration object
///
- public class DbGridConfig : GridConfig
- {
+ public class DbGridConfig : GridConfig
+ {
///
/// The DB4o Database
///
- private IObjectContainer db;
+ private IObjectContainer db;
///
/// User configuration for the Grid Config interfaces
///
- public void LoadDefaults() {
- MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+ public void LoadDefaults()
+ {
+ MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
// About the grid options
- this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
+ this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team");
// Asset Options
- this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
+ this.DefaultAssetServer = MainLog.Instance.CmdPrompt("Default asset server","http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/");
this.AssetSendKey = MainLog.Instance.CmdPrompt("Key to send to asset server","null");
this.AssetRecvKey = MainLog.Instance.CmdPrompt("Key to expect from asset server","null");
// User Server Options
- this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/");
- this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
- this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
+ this.DefaultUserServer = MainLog.Instance.CmdPrompt("Default user server","http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/");
+ this.UserSendKey = MainLog.Instance.CmdPrompt("Key to send to user server","null");
+ this.UserRecvKey = MainLog.Instance.CmdPrompt("Key to expect from user server","null");
// Region Server Options
this.SimSendKey = MainLog.Instance.CmdPrompt("Key to send to sims","null");
this.SimRecvKey = MainLog.Instance.CmdPrompt("Key to expect from sims","null");
- }
+ }
///
/// Initialises a new configuration object
///
- public override void InitConfig() {
- try {
+ public override void InitConfig()
+ {
+ try
+ {
// Perform Db4o initialisation
- db = Db4oFactory.OpenFile("opengrid.yap");
+ db = Db4oFactory.OpenFile("opengrid.yap");
// Locate the grid configuration object
- IObjectSet result = db.Get(typeof(DbGridConfig));
+ IObjectSet result = db.Get(typeof(DbGridConfig));
// Found?
- if(result.Count==1) {
- MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Found a GridConfig object in the local database, loading");
- foreach (DbGridConfig cfg in result) {
+ if (result.Count==1)
+ {
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Found a GridConfig object in the local database, loading");
+ foreach (DbGridConfig cfg in result)
+ {
// Import each setting into this class
// Grid Settings
- this.GridOwner=cfg.GridOwner;
+ this.GridOwner=cfg.GridOwner;
// Asset Settings
- this.DefaultAssetServer=cfg.DefaultAssetServer;
- this.AssetSendKey=cfg.AssetSendKey;
- this.AssetRecvKey=cfg.AssetRecvKey;
+ this.DefaultAssetServer=cfg.DefaultAssetServer;
+ this.AssetSendKey=cfg.AssetSendKey;
+ this.AssetRecvKey=cfg.AssetRecvKey;
// User Settings
- this.DefaultUserServer=cfg.DefaultUserServer;
- this.UserSendKey=cfg.UserSendKey;
- this.UserRecvKey=cfg.UserRecvKey;
+ this.DefaultUserServer=cfg.DefaultUserServer;
+ this.UserSendKey=cfg.UserSendKey;
+ this.UserRecvKey=cfg.UserRecvKey;
// Region Settings
- this.SimSendKey=cfg.SimSendKey;
- this.SimRecvKey=cfg.SimRecvKey;
- }
- // Create a new configuration object from this class
- } else {
- MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+ this.SimSendKey=cfg.SimSendKey;
+ this.SimRecvKey=cfg.SimRecvKey;
+ }
+ // Create a new configuration object from this class
+ }
+ else
+ {
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Could not find object in database, loading precompiled defaults");
// Load default settings into this class
- LoadDefaults();
+ LoadDefaults();
// Saves to the database file...
- MainLog.Instance.Verbose( "Writing out default settings to local database");
- db.Set(this);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Writing out default settings to local database");
+ db.Set(this);
// Closes file locks
- db.Close();
- }
- } catch(Exception e) {
- MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
+ db.Close();
+ }
+ }
+ catch(Exception e)
+ {
+ MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured");
MainLog.Instance.Warn(e.ToString());
- }
+ }
// Grid Settings
- MainLog.Instance.Verbose("Grid settings loaded:");
- MainLog.Instance.Verbose("Grid owner: " + this.GridOwner);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Grid settings loaded:");
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Grid owner: " + this.GridOwner);
// Asset Settings
- MainLog.Instance.Verbose("Default asset server: " + this.DefaultAssetServer);
- MainLog.Instance.Verbose("Key to send to asset server: " + this.AssetSendKey);
- MainLog.Instance.Verbose("Key to expect from asset server: " + this.AssetRecvKey);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Default asset server: " + this.DefaultAssetServer);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to asset server: " + this.AssetSendKey);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from asset server: " + this.AssetRecvKey);
// User Settings
- MainLog.Instance.Verbose("Default user server: " + this.DefaultUserServer);
- MainLog.Instance.Verbose("Key to send to user server: " + this.UserSendKey);
- MainLog.Instance.Verbose("Key to expect from user server: " + this.UserRecvKey);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Default user server: " + this.DefaultUserServer);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to user server: " + this.UserSendKey);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from user server: " + this.UserRecvKey);
// Region Settings
- MainLog.Instance.Verbose("Key to send to sims: " + this.SimSendKey);
- MainLog.Instance.Verbose("Key to expect from sims: " + this.SimRecvKey);
- }
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to send to sims: " + this.SimSendKey);
+ MainLog.Instance.Verbose("DBGRIDCONFIG", "Key to expect from sims: " + this.SimRecvKey);
+ }
///
/// Closes down the database and releases filesystem locks
///
- public void Shutdown() {
- db.Close();
- }
- }
-
+ public void Shutdown()
+ {
+ db.Close();
+ }
+ }
}
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
index 1f93779..748973d 100644
--- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
+++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs
@@ -1,30 +1,30 @@
/*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
using System;
using Db4objects.Db4o;
using OpenSim.Framework.Configuration;
@@ -33,64 +33,72 @@ using OpenSim.Framework.Interfaces;
namespace OpenUser.Config.UserConfigDb4o
{
- public class Db4oConfigPlugin: IUserConfig
- {
- public UserConfig GetConfigObject()
- {
- MainLog.Instance.Verbose("Loading Db40Config dll");
- return ( new DbUserConfig());
- }
- }
+ public class Db4oConfigPlugin: IUserConfig
+ {
+ public UserConfig GetConfigObject()
+ {
+ MainLog.Instance.Verbose("DBUSERCONFIG", "Loading Db40Config dll");
+ return ( new DbUserConfig());
+ }
+ }
- public class DbUserConfig : UserConfig
- {
- private IObjectContainer db;
+ public class DbUserConfig : UserConfig
+ {
+ private IObjectContainer db;
- public void LoadDefaults() {
- MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+ public void LoadDefaults()
+ {
+ MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
- this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
+ this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS");
- this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/");
- this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
- this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
- }
+ this.GridServerURL = MainLog.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/");
+ this.GridSendKey = MainLog.Instance.CmdPrompt("Key to send to grid server","null");
+ this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
+ }
- public override void InitConfig() {
- try {
- db = Db4oFactory.OpenFile("openuser.yap");
- IObjectSet result = db.Get(typeof(DbUserConfig));
- if(result.Count==1) {
- MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading");
- foreach (DbUserConfig cfg in result) {
- this.GridServerURL=cfg.GridServerURL;
- this.GridSendKey=cfg.GridSendKey;
- this.GridRecvKey=cfg.GridRecvKey;
- this.DefaultStartupMsg=cfg.DefaultStartupMsg;
- }
- } else {
- MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
- LoadDefaults();
- MainLog.Instance.Verbose("Writing out default settings to local database");
- db.Set(this);
- db.Close();
- }
- } catch(Exception e) {
- MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured");
+ public override void InitConfig()
+ {
+ try
+ {
+ db = Db4oFactory.OpenFile("openuser.yap");
+ IObjectSet result = db.Get(typeof(DbUserConfig));
+ if(result.Count==1)
+ {
+ MainLog.Instance.Verbose("DBUSERCONFIG", "DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading");
+ foreach (DbUserConfig cfg in result)
+ {
+ this.GridServerURL=cfg.GridServerURL;
+ this.GridSendKey=cfg.GridSendKey;
+ this.GridRecvKey=cfg.GridRecvKey;
+ this.DefaultStartupMsg=cfg.DefaultStartupMsg;
+ }
+ }
+ else
+ {
+ MainLog.Instance.Verbose("DBUSERCONFIG", "DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+ LoadDefaults();
+ MainLog.Instance.Verbose("DBUSERCONFIG", "Writing out default settings to local database");
+ db.Set(this);
+ db.Close();
+ }
+ }
+ catch(Exception e)
+ {
+ MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured");
MainLog.Instance.Warn(e.ToString());
- }
+ }
- MainLog.Instance.Verbose("User settings loaded:");
- MainLog.Instance.Verbose("Default startup message: " + this.DefaultStartupMsg);
- MainLog.Instance.Verbose("Grid server URL: " + this.GridServerURL);
- MainLog.Instance.Verbose("Key to send to grid: " + this.GridSendKey);
- MainLog.Instance.Verbose("Key to expect from grid: " + this.GridRecvKey);
- }
-
-
- public void Shutdown() {
- db.Close();
- }
- }
+ MainLog.Instance.Verbose("DBUSERCONFIG", "User settings loaded:");
+ MainLog.Instance.Verbose("DBUSERCONFIG", "Default startup message: " + this.DefaultStartupMsg);
+ MainLog.Instance.Verbose("DBUSERCONFIG", "Grid server URL: " + this.GridServerURL);
+ MainLog.Instance.Verbose("DBUSERCONFIG", "Key to send to grid: " + this.GridSendKey);
+ MainLog.Instance.Verbose("DBUSERCONFIG", "Key to expect from grid: " + this.GridRecvKey);
+ }
+ public void Shutdown()
+ {
+ db.Close();
+ }
+ }
}
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index adbc625..0e66330 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -1,4 +1,32 @@
-using System;
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+using System;
using System.Collections.Generic;
using System.Text;
using Mono.Addins;
@@ -14,4 +42,3 @@ namespace OpenSim
void Close();
}
}
-
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d6dc3ea..64fe8df 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -449,7 +449,7 @@ namespace OpenSim
public void handleRestartRegion(RegionInfo whichRegion)
{
- MainLog.Instance.Error("MAIN", "Got Restart Singlal from SceneManager");
+ MainLog.Instance.Error("MAIN", "Got restart signal from SceneManager");
// Shutting down the UDP server
bool foundUDPServer = false;
int UDPServerElement = 0;
@@ -543,7 +543,7 @@ namespace OpenSim
m_log.Verbose("SHUTDOWN", "Closing all threads");
m_log.Verbose("SHUTDOWN", "Killing listener thread");
m_log.Verbose("SHUTDOWN", "Killing clients");
- // IMPLEMENT THIS
+ // TODO: implement this
m_log.Verbose("SHUTDOWN", "Closing console and terminating");
m_sceneManager.Close();
@@ -789,10 +789,7 @@ namespace OpenSim
{
string regionName = CombineParams(cmdparams, 0);
- if (m_sceneManager.TrySetCurrentScene(regionName))
- {
- }
- else
+ if (!m_sceneManager.TrySetCurrentScene(regionName))
{
MainLog.Instance.Error("Couldn't set current region to: " + regionName);
}
@@ -812,16 +809,14 @@ namespace OpenSim
break;
case "export-map":
-
- if (cmdparams.Length > 0)
- {
- m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
- }
- else
- {
- m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
- }
-
+ if (cmdparams.Length > 0)
+ {
+ m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
+ }
+ else
+ {
+ m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
+ }
break;
default:
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 415b04e..fb1623b 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2546,7 +2546,7 @@ namespace OpenSim.Region.ClientStack
return;
}
- //MainLog.Instance.Verbose("Sending PacketAck");
+ //MainLog.Instance.Verbose("NETWORK", "Sending PacketAck");
int i = 0;
PacketAckPacket acks = new PacketAckPacket();
@@ -2701,7 +2701,6 @@ namespace OpenSim.Region.ClientStack
}
break;
case PacketType.AgentSetAppearance:
- //MainLog.Instance.Verbose("set appear", Pack.ToString());
AgentSetAppearancePacket appear = (AgentSetAppearancePacket) Pack;
if (OnSetAppearance != null)
{
@@ -2785,7 +2784,6 @@ namespace OpenSim.Region.ClientStack
#region Objects/m_sceneObjects
case PacketType.ObjectLink:
- //MainLog.Instance.Verbose(Pack.ToString());
ObjectLinkPacket link = (ObjectLinkPacket) Pack;
uint parentprimid = 0;
List childrenprims = new List();
@@ -2804,7 +2802,6 @@ namespace OpenSim.Region.ClientStack
}
break;
case PacketType.ObjectDelink:
- //MainLog.Instance.Verbose(Pack.ToString());
ObjectDelinkPacket delink = (ObjectDelinkPacket) Pack;
// It appears the prim at index 0 is not always the root prim (for
@@ -3677,8 +3674,7 @@ namespace OpenSim.Region.ClientStack
MainLog.Instance.Debug("CLIENT", "possibly unhandled StartPingCheck packet");
break;
case PacketType.CompletePingCheck:
- // Parhaps this should be processed on the Sim to determine whether or not to drop a dead client
- // Dumping it to the verbose console until it's handled properly.
+ // TODO: Perhaps this should be processed on the Sim to determine whether or not to drop a dead client
MainLog.Instance.Warn("CLIENT", "unhandled CompletePingCheck packet");
break;
case PacketType.ObjectScale:
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 4c168b3..04bdf5a 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -37,16 +37,14 @@ namespace OpenSim.Region.Environment.Scenes
public InnerScene(Scene parent, RegionInfo regInfo, PermissionManager permissionsMngr)
{
-
m_parentScene = parent;
m_regInfo = regInfo;
PermissionsMngr = permissionsMngr;
QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256);
QuadTree.Subdivide();
QuadTree.Subdivide();
-
-
}
+
public PhysicsScene PhysicsScene
{
get
@@ -372,7 +370,6 @@ namespace OpenSim.Region.Environment.Scenes
#region Other Methods
-
public void physicsBasedCrash()
{
if (UnRecoverableError != null)
@@ -662,8 +659,6 @@ namespace OpenSim.Region.Environment.Scenes
///
public void DelinkObjects(List primIds)
{
- //MainLog.Instance.Verbose("DelinkObjects()");
-
SceneObjectGroup parenPrim = null;
// Need a list of the SceneObjectGroup local ids
@@ -744,17 +739,20 @@ namespace OpenSim.Region.Environment.Scenes
}
}
+
+ ///
+ /// Calculates the distance between two Vector3s
+ ///
+ ///
+ ///
+ ///
public float Vector3Distance(Vector3 v1, Vector3 v2)
{
- // Calculates the distance between two Vector3s
// We don't really need the double floating point precision...
// so casting it to a single
return (float)Math.Sqrt((v1.x - v2.x) * (v1.x - v2.x) + (v1.y - v2.y) * (v1.y - v2.y) + (v1.z - v2.z) * (v1.z - v2.z));
-
}
#endregion
}
}
-
-
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index d8abe90..dbcd332 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Environment.Scenes
foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
{
EntityBase selectedEnt = null;
- //MainLog.Instance.Verbose("LocalID:" + Data.ObjectLocalID.ToString());
+ //MainLog.Instance.Verbose("CLIENT", "LocalID:" + Data.ObjectLocalID.ToString());
foreach (EntityBase ent in Entities.Values)
{
if (ent.LocalId == Data.ObjectLocalID)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index c1e4805..484b9f1 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
public void LoadAnims()
{
- //MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
+ //MainLog.Instance.Verbose("CLIENT", "Loading avatar animations");
using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
{
XmlDocument doc = new XmlDocument();
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
- // MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+ // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
foreach (KeyValuePair kp in Animations.AnimsLLUUID)
{
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2f00515..83d3306 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -711,6 +711,9 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
if (part != null)
{
+ // TODO: determine position to sit at based on scene geometry; don't trust offset from client
+ // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
+
pos = part.AbsolutePosition + offset;
if (m_physicsActor != null)
diff --git a/OpenSim/Region/ExtensionsScriptModule/Script.cs b/OpenSim/Region/ExtensionsScriptModule/Script.cs
index 350ca2d..4493741 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Script.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Script.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
private void events_OnFrame()
{
- //script.logger.Verbose("Hello World!");
+ //script.logger.Verbose("TESTSCRIPT", "Hello World!");
}
}
}
\ No newline at end of file
--
cgit v1.1