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

removed obsolete Verbose() function

afrisby
Jeff Ames 2007-12-06 18:17:44 +00:00
parent a47176ee92
commit 73599c0f25
11 changed files with 215 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Framework/Console/LogBase.cs
View File

@ -163,21 +163,6 @@ namespace OpenSim.Framework.Console
return;
}
/// <summary>
/// Sends a informational message to the current log output
/// </summary>
/// <param name="format">The message to send</param>
/// <param name="args">WriteLine-style message arguments</param>
[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;
}
}
/// <summary>
/// Sends an informational message to the current log output
/// </summary>

57
OpenSim/Grid/GridServer.Config/DbGridConfig.cs
View File

@ -44,8 +44,8 @@ namespace OpenGrid.Config.GridConfigDb4o
/// <returns>A grid configuration object</returns>
public GridConfig GetConfigObject()
{
MainLog.Instance.Verbose("Loading Db40Config dll");
return ( new DbGridConfig());
MainLog.Instance.Verbose("DBGRIDCONFIG", "Loading Db40Config dll");
return new DbGridConfig();
}
}
@ -62,7 +62,8 @@ namespace OpenGrid.Config.GridConfigDb4o
/// <summary>
/// User configuration for the Grid Config interfaces
/// </summary>
public void LoadDefaults() {
public void LoadDefaults()
{
MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
// About the grid options
@ -86,17 +87,21 @@ namespace OpenGrid.Config.GridConfigDb4o
/// <summary>
/// Initialises a new configuration object
/// </summary>
public override void InitConfig() {
try {
public override void InitConfig()
{
try
{
// Perform Db4o initialisation
db = Db4oFactory.OpenFile("opengrid.yap");
// Locate the grid configuration object
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;
@ -113,49 +118,53 @@ namespace OpenGrid.Config.GridConfigDb4o
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");
}
else
{
MainLog.Instance.Verbose("DBGRIDCONFIG", "Could not find object in database, loading precompiled defaults");
// Load default settings into this class
LoadDefaults();
// Saves to the database file...
MainLog.Instance.Verbose( "Writing out default settings to local database");
MainLog.Instance.Verbose("DBGRIDCONFIG", "Writing out default settings to local database");
db.Set(this);
// Closes file locks
db.Close();
}
} catch(Exception e) {
}
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);
}
/// <summary>
/// Closes down the database and releases filesystem locks
/// </summary>
public void Shutdown() {
public void Shutdown()
{
db.Close();
}
}
}

98
OpenSim/Grid/UserServer.Config/DbUserConfig.cs
View File

@ -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;
@ -37,7 +37,7 @@ namespace OpenUser.Config.UserConfigDb4o
{
public UserConfig GetConfigObject()
{
MainLog.Instance.Verbose("Loading Db40Config dll");
MainLog.Instance.Verbose("DBUSERCONFIG", "Loading Db40Config dll");
return ( new DbUserConfig());
}
}
@ -46,7 +46,8 @@ namespace OpenUser.Config.UserConfigDb4o
{
private IObjectContainer db;
public void LoadDefaults() {
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");
@ -56,41 +57,48 @@ namespace OpenUser.Config.UserConfigDb4o
this.GridRecvKey = MainLog.Instance.CmdPrompt("Key to expect from grid server","null");
}
public override void InitConfig() {
try {
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) {
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.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
}
else
{
MainLog.Instance.Verbose("DBUSERCONFIG", "DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
LoadDefaults();
MainLog.Instance.Verbose("Writing out default settings to local database");
MainLog.Instance.Verbose("DBUSERCONFIG", "Writing out default settings to local database");
db.Set(this);
db.Close();
}
} catch(Exception e) {
}
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);
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() {
public void Shutdown()
{
db.Close();
}
}
}

31
OpenSim/Region/Application/IApplicationPlugin.cs
View File

@ -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();
}
}

11
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -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,7 +809,6 @@ namespace OpenSim
break;
case "export-map":
if (cmdparams.Length > 0)
{
m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
@ -821,7 +817,6 @@ namespace OpenSim
{
m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
}
break;
default:

8
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -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<uint> childrenprims = new List<uint>();
@ -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:

18
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -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
/// <param name="prims"></param>
public void DelinkObjects(List<uint> 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
}
}
/// <summary>
/// Calculates the distance between two Vector3s
/// </summary>
/// <param name="v1"></param>
/// <param name="v2"></param>
/// <returns></returns>
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
}
}

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

@ -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)

4
OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
View File

@ -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<string, LLUUID> kp in Animations.AnimsLLUUID)
{

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

@ -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)

2
OpenSim/Region/ExtensionsScriptModule/Script.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
private void events_OnFrame()
{
//script.logger.Verbose("Hello World!");
//script.logger.Verbose("TESTSCRIPT", "Hello World!");
}
}
}