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

keeping opensim safe for children -- made some namespace references less explicit

afrisby
Jeff Ames 2007-12-04 22:14:53 +00:00
parent 54c070608e
commit f195725db4
18 changed files with 54 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -32,7 +32,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
{ {
if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled");
m_app = openSim; m_app = openSim;
m_httpd = openSim.HttpServer; m_httpd = openSim.HttpServer;

4
OpenSim/Framework/Servers/CheckSumServer.cs
View File

@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
namespace OpenSim.Framework.Servers namespace OpenSim.Framework.Servers
{ {
/* /*
@ -113,8 +114,7 @@ namespace OpenSim.Framework.Servers
} }
catch (Exception) catch (Exception)
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection "); MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
} }
} }

2
OpenSim/Region/ClientStack/PacketQueue.cs
View File

@ -321,7 +321,7 @@ namespace OpenSim.Region.ClientStack
tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset; tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset;
/* /*
OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Client AgentThrottle - Got throttle:resendbytes=" + tResend + MainLog.Instance.Verbose("CLIENT", "Client AgentThrottle - Got throttle:resendbytes=" + tResend +
" landbytes=" + tLand + " landbytes=" + tLand +
" windbytes=" + tWind + " windbytes=" + tWind +
" cloudbytes=" + tCloud + " cloudbytes=" + tCloud +

21
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -29,6 +29,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
namespace OpenSim.Region.Communications.Local namespace OpenSim.Region.Communications.Local
@ -50,7 +51,6 @@ namespace OpenSim.Region.Communications.Local
set set
{ {
_gdebugRegionName = value; _gdebugRegionName = value;
} }
} }
public string _rdebugRegionName = ""; public string _rdebugRegionName = "";
@ -61,7 +61,6 @@ namespace OpenSim.Region.Communications.Local
set set
{ {
_rdebugRegionName = value; _rdebugRegionName = value;
} }
} }
public LocalBackEndServices() public LocalBackEndServices()
@ -84,7 +83,7 @@ namespace OpenSim.Region.Communications.Local
RegionCommsListener regionHost = new RegionCommsListener(); RegionCommsListener regionHost = new RegionCommsListener();
if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
{ {
OpenSim.Framework.Console.MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up."); MainLog.Instance.Error("INTERREGION", "Error:Region registered twice as an Events listener for Interregion Communications but not as a listed region. In Standalone mode this will cause BIG issues. In grid mode, it means a region went down and came back up.");
m_regionListeners.Remove(regionInfo.RegionHandle); m_regionListeners.Remove(regionInfo.RegionHandle);
} }
m_regionListeners.Add(regionInfo.RegionHandle, regionHost); m_regionListeners.Add(regionInfo.RegionHandle, regionHost);
@ -95,7 +94,7 @@ namespace OpenSim.Region.Communications.Local
{ {
// Already in our list, so the region went dead and restarted. // Already in our list, so the region went dead and restarted.
m_regions.Remove(regionInfo.RegionHandle); m_regions.Remove(regionInfo.RegionHandle);
OpenSim.Framework.Console.MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up."); MainLog.Instance.Warn("INTERREGION", "Region registered twice. Region went down and came back up.");
RegionCommsListener regionHost = new RegionCommsListener(); RegionCommsListener regionHost = new RegionCommsListener();
if (m_regionListeners.ContainsKey(regionInfo.RegionHandle)) if (m_regionListeners.ContainsKey(regionInfo.RegionHandle))
@ -208,7 +207,6 @@ namespace OpenSim.Region.Communications.Local
public bool TriggerRegionUp(RegionInfo region, ulong regionhandle) public bool TriggerRegionUp(RegionInfo region, ulong regionhandle)
{ {
if (m_regionListeners.ContainsKey(regionhandle)) if (m_regionListeners.ContainsKey(regionhandle))
{ {
return m_regionListeners[regionhandle].TriggerRegionUp(region); return m_regionListeners[regionhandle].TriggerRegionUp(region);
@ -227,13 +225,13 @@ namespace OpenSim.Region.Communications.Local
//should change from agentCircuitData //should change from agentCircuitData
{ {
//Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent"); //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
//OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname); //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Trying to inform region of child agent: " + agentData.firstname + " " + agentData.lastname);
if (m_regionListeners.ContainsKey(regionHandle)) if (m_regionListeners.ContainsKey(regionHandle))
{ {
// Console.WriteLine("CommsManager- Informing a region to expect child agent"); // Console.WriteLine("CommsManager- Informing a region to expect child agent");
m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData); m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
//OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname); //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Got Listener trigginering local event: " + agentData.firstname + " " + agentData.lastname);
return true; return true;
} }
@ -327,11 +325,11 @@ namespace OpenSim.Region.Communications.Local
public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) public void TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
{ {
//OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname); //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other region is sending child agent our way: " + agent.firstname + " " + agent.lastname);
if (m_regionListeners.ContainsKey(regionHandle)) if (m_regionListeners.ContainsKey(regionHandle))
{ {
//OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname); //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: FoundLocalRegion To send it to: " + agent.firstname + " " + agent.lastname);
m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent); m_regionListeners[regionHandle].TriggerExpectUser(regionHandle, agent);
} }
@ -343,7 +341,6 @@ namespace OpenSim.Region.Communications.Local
{ {
m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData);
} }
} }
public void PingCheckReply(Hashtable respData) public void PingCheckReply(Hashtable respData)
@ -381,11 +378,11 @@ namespace OpenSim.Region.Communications.Local
public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData) public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
{ {
// OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname); // MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: Other local region is sending child agent our way: " + agentData.firstname + " " + agentData.lastname);
if (m_regionListeners.ContainsKey(regionHandle)) if (m_regionListeners.ContainsKey(regionHandle))
{ {
//OpenSim.Framework.Console.MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname); //MainLog.Instance.Verbose("INTER", rdebugRegionName + ":Local BackEnd: found local region to trigger event on: " + agentData.firstname + " " + agentData.lastname);
TriggerExpectUser(regionHandle, agentData); TriggerExpectUser(regionHandle, agentData);
return true; return true;

8
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -50,8 +50,8 @@ namespace OpenSim.Region.Communications.OGS1
{ {
if (data.Contains("error_type")) if (data.Contains("error_type"))
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] + MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] +
"): " + data["error_desc"]); "): " + data["error_desc"]);
return null; return null;
} }
@ -104,16 +104,13 @@ namespace OpenSim.Region.Communications.OGS1
MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer"); MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer");
} }
return pickerlist; return pickerlist;
} }
public UserProfileData GetUserProfile(string firstName, string lastName) public UserProfileData GetUserProfile(string firstName, string lastName)
{ {
return GetUserProfile(firstName + " " + lastName); return GetUserProfile(firstName + " " + lastName);
} }
public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query)
{ {
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
@ -138,6 +135,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
return pickerlist; return pickerlist;
} }
public UserProfileData GetUserProfile(string name) public UserProfileData GetUserProfile(string name)
{ {
try try

4
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -259,7 +259,6 @@ namespace OpenSim.Region.Environment.Modules
} }
} }
} }
} }
} }
@ -306,7 +305,7 @@ namespace OpenSim.Region.Environment.Modules
} }
catch (Exception) catch (Exception)
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration"); MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration");
} }
m_log = MainLog.Instance; m_log = MainLog.Instance;
} }
@ -442,7 +441,6 @@ namespace OpenSim.Region.Environment.Modules
} }
} }
public void Close() public void Close()
{ {
listener.Abort(); listener.Abort();

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

@ -662,7 +662,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="prims"></param> /// <param name="prims"></param>
public void DelinkObjects(List<uint> primIds) public void DelinkObjects(List<uint> primIds)
{ {
//OpenSim.Framework.Console.MainLog.Instance.Verbose("DelinkObjects()"); //MainLog.Instance.Verbose("DelinkObjects()");
SceneObjectGroup parenPrim = null; SceneObjectGroup parenPrim = null;
@ -700,7 +700,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE", MainLog.Instance.Verbose("SCENE",
"DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!", "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
primIds); primIds);
} }

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

@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn( MainLog.Instance.Warn(
"Asset ID " + item.assetID + " not found for item ID " + itemID "Asset ID " + item.assetID + " not found for item ID " + itemID
+ " named " + item.inventoryName + " for an inventory item update."); + " named " + item.inventoryName + " for an inventory item update.");
return; return;
@ -199,13 +199,13 @@ namespace OpenSim.Region.Environment.Scenes
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn( MainLog.Instance.Warn(
"Item ID " + itemID + " not found for an inventory item update."); "Item ID " + itemID + " not found for an inventory item update.");
} }
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn( MainLog.Instance.Warn(
"Agent ID " + remoteClient.AgentId + " not found for an inventory item update."); "Agent ID " + remoteClient.AgentId + " not found for an inventory item update.");
} }
} }
@ -439,7 +439,7 @@ namespace OpenSim.Region.Environment.Scenes
foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
{ {
EntityBase selectedEnt = null; EntityBase selectedEnt = null;
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString()); //MainLog.Instance.Verbose("LocalID:" + Data.ObjectLocalID.ToString());
foreach (EntityBase ent in Entities.Values) foreach (EntityBase ent in Entities.Values)
{ {
if (ent.LocalId == Data.ObjectLocalID) if (ent.LocalId == Data.ObjectLocalID)

12
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -7,7 +7,6 @@ using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
namespace OpenSim.Region.Environment.Scenes namespace OpenSim.Region.Environment.Scenes
{ {
public delegate void KillObjectDelegate(uint localID); public delegate void KillObjectDelegate(uint localID);
@ -28,16 +27,12 @@ namespace OpenSim.Region.Environment.Scenes
public KillObjectDelegate KillObject; public KillObjectDelegate KillObject;
public string _debugRegionName = ""; public string _debugRegionName = "";
public string debugRegionName public string debugRegionName
{ {
get { return _debugRegionName; } get { return _debugRegionName; }
set set
{ {
_debugRegionName = value; _debugRegionName = value;
} }
} }
@ -64,13 +59,10 @@ namespace OpenSim.Region.Environment.Scenes
regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing; regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing;
regionCommsHost.OnCloseAgentConnection += CloseConnection; regionCommsHost.OnCloseAgentConnection += CloseConnection;
regionCommsHost.OnRegionUp += newRegionUp; regionCommsHost.OnRegionUp += newRegionUp;
} }
else else
{ {
//MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null"); //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: registered with gridservice and got null");
} }
} }
@ -360,8 +352,6 @@ namespace OpenSim.Region.Environment.Scenes
return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying); return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
} }
public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical) public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical)
{ {
return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical); return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical);
@ -371,11 +361,9 @@ namespace OpenSim.Region.Environment.Scenes
{ {
foreach (ulong regionHandle in presence.KnownChildRegions) foreach (ulong regionHandle in presence.KnownChildRegions)
{ {
m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId); m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId);
presence.RemoveNeighbourRegion(regionHandle); presence.RemoveNeighbourRegion(regionHandle);
} }
} }
} }
} }

5
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@ -95,7 +95,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
scene.OnRestart += HandleRestart; scene.OnRestart += HandleRestart;
m_localScenes.Add(scene); m_localScenes.Add(scene);
} }
public void HandleRestart(RegionInfo rdata) public void HandleRestart(RegionInfo rdata)
@ -155,6 +154,7 @@ namespace OpenSim.Region.Environment.Scenes
MainLog.Instance.Error("REGION", "Unable to notify Other regions of this Region coming up"); MainLog.Instance.Error("REGION", "Unable to notify Other regions of this Region coming up");
} }
} }
public void SaveCurrentSceneToXml(string filename) public void SaveCurrentSceneToXml(string filename)
{ {
CurrentOrFirstScene.SavePrimsToXml(filename); CurrentOrFirstScene.SavePrimsToXml(filename);
@ -291,7 +291,6 @@ namespace OpenSim.Region.Environment.Scenes
return false; return false;
} }
public void SetDebugPacketOnCurrentScene(LogBase log, int newDebug) public void SetDebugPacketOnCurrentScene(LogBase log, int newDebug)
{ {
ForEachCurrentScene(delegate(Scene scene) ForEachCurrentScene(delegate(Scene scene)
@ -360,7 +359,6 @@ namespace OpenSim.Region.Environment.Scenes
}); });
} }
public void ForceCurrentSceneClientUpdate() public void ForceCurrentSceneClientUpdate()
{ {
ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); }); ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); });
@ -401,7 +399,6 @@ namespace OpenSim.Region.Environment.Scenes
return false; return false;
} }
public void CloseScene(Scene scene) public void CloseScene(Scene scene)
{ {
m_localScenes.Remove(scene); m_localScenes.Remove(scene);

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

@ -35,6 +35,7 @@ using Axiom.Math;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using System.Drawing; using System.Drawing;
@ -951,7 +952,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE", MainLog.Instance.Verbose("SCENE",
"DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}", "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
partID, LocalId); partID, LocalId);
} }

6
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -34,6 +34,7 @@ using Axiom.Math;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes.Scripting; using OpenSim.Region.Environment.Scenes.Scripting;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
@ -1392,15 +1393,12 @@ namespace OpenSim.Region.Environment.Scenes
public void PhysicsOutOfBounds(PhysicsVector pos) public void PhysicsOutOfBounds(PhysicsVector pos)
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds."); MainLog.Instance.Verbose("PHYSICS", "Physical Object went out of bounds.");
RemFlag(LLObject.ObjectFlags.Physics); RemFlag(LLObject.ObjectFlags.Physics);
DoPhysicsPropertyUpdate(false, true); DoPhysicsPropertyUpdate(false, true);
m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); m_parentGroup.m_scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
} }
public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient) public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient)
{ {
} }

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

@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
public void LoadAnims() public void LoadAnims()
{ {
//OpenSim.Framework.Console.MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations"); //MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations");
using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
// OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); // MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID) foreach (KeyValuePair<string, LLUUID> kp in Animations.AnimsLLUUID)
{ {

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

@ -36,7 +36,6 @@ using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Types; using OpenSim.Region.Environment.Types;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes namespace OpenSim.Region.Environment.Scenes
{ {
public partial class ScenePresence : EntityBase public partial class ScenePresence : EntityBase
@ -512,7 +511,7 @@ namespace OpenSim.Region.Environment.Scenes
for (int i = 0; i < visualParam.Length; i++) for (int i = 0; i < visualParam.Length; i++)
{ {
m_visualParams[i] = visualParam[i].ParamValue; m_visualParams[i] = visualParam[i].ParamValue;
//OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "VisualData[" + i.ToString() + "]: " + visualParam[i].ParamValue.ToString() + "m"); //MainLog.Instance.Verbose("CLIENT", "VisualData[" + i.ToString() + "]: " + visualParam[i].ParamValue.ToString() + "m");
} }
// Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters. // Teravus : Nifty AV Height Getting Maaaaagical formula. Oh how we love turning 0-255 into meters.
@ -525,7 +524,7 @@ namespace OpenSim.Region.Environment.Scenes
PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight); PhysicsVector SetSize = new PhysicsVector(0.45f, 0.6f, m_avHeight);
PhysicsActor.Size = SetSize; PhysicsActor.Size = SetSize;
} }
//OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m"); //MainLog.Instance.Verbose("CLIENT", "Set Avatar Height to: " + (1.50856f + (((float)m_visualParams[25] / 255.0f) * (2.525506f - 1.50856f))).ToString() + "m" + " Leglength: " + ((float)m_visualParams[125]).ToString() + ":" + (((float)m_visualParams[125] / 255.0f)).ToString() + "m");
SendAppearanceToAllOtherAgents(); SendAppearanceToAllOtherAgents();
} }
@ -675,7 +674,6 @@ namespace OpenSim.Region.Environment.Scenes
UpdateMovementAnimations(update_movementflag); UpdateMovementAnimations(update_movementflag);
} }
} }
} }
/// <summary> /// <summary>
@ -781,7 +779,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
PhysicsActor.SetAlwaysRun = SetAlwaysRun; PhysicsActor.SetAlwaysRun = SetAlwaysRun;
} }
} }
protected void UpdateMovementAnimations(bool update_movementflag) protected void UpdateMovementAnimations(bool update_movementflag)
@ -1020,7 +1017,6 @@ namespace OpenSim.Region.Environment.Scenes
m_newCoarseLocations = true; m_newCoarseLocations = true;
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

2
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -130,7 +130,7 @@ namespace OpenSim.Region.Physics.Manager
{ {
m_workIndicator = (m_workIndicator + 1)%10; m_workIndicator = (m_workIndicator + 1)%10;
//OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); //MainLog.Instance.SetStatus(m_workIndicator.ToString());
} }
public override void GetResults() public override void GetResults()

8
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Axiom.Math; using Axiom.Math;
using Ode.NET; using Ode.NET;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.Physics.OdePlugin namespace OpenSim.Region.Physics.OdePlugin
@ -229,7 +230,7 @@ namespace OpenSim.Region.Physics.OdePlugin
CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * 0.43f))); // subtract 43% of the size CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * 0.43f))); // subtract 43% of the size
d.BodyDestroy(Body); d.BodyDestroy(Body);
d.GeomDestroy(Shell); d.GeomDestroy(Shell);
//OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Set Avatar Height To: " + (CAPSULE_RADIUS + CAPSULE_LENGTH)); //MainLog.Instance.Verbose("PHYSICS", "Set Avatar Height To: " + (CAPSULE_RADIUS + CAPSULE_LENGTH));
Shell = d.CreateCapsule(_parent_scene.space, capsuleradius, CAPSULE_LENGTH); Shell = d.CreateCapsule(_parent_scene.space, capsuleradius, CAPSULE_LENGTH);
d.MassSetCapsule(out ShellMass, 50.0f, 3, CAPSULE_RADIUS, CAPSULE_LENGTH); d.MassSetCapsule(out ShellMass, 50.0f, 3, CAPSULE_RADIUS, CAPSULE_LENGTH);
Body = d.BodyCreate(_parent_scene.world); Body = d.BodyCreate(_parent_scene.world);
@ -428,13 +429,12 @@ namespace OpenSim.Region.Physics.OdePlugin
int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
if (primScenAvatarIn == "0") if (primScenAvatarIn == "0")
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in space with no prim. Arr:':" + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in space with no prim. Arr:':" + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in Prim space':" + primScenAvatarIn + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); MainLog.Instance.Verbose("Physics", "Avatar " + m_name + " in Prim space':" + primScenAvatarIn + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
} }
} }
} }
else else

22
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Axiom.Math; using Axiom.Math;
using Ode.NET; using Ode.NET;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.Physics.OdePlugin namespace OpenSim.Region.Physics.OdePlugin
@ -47,12 +48,9 @@ namespace OpenSim.Region.Physics.OdePlugin
private const float MassMultiplier = 150f; // Ref: Water: 1000kg.. this iset to 500 private const float MassMultiplier = 150f; // Ref: Water: 1000kg.. this iset to 500
private int debugcounter = 0; private int debugcounter = 0;
public OdePrim(String primName, OdeScene parent_scene, IntPtr targetSpace, PhysicsVector pos, PhysicsVector size, public OdePrim(String primName, OdeScene parent_scene, IntPtr targetSpace, PhysicsVector pos, PhysicsVector size,
Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical) Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical)
{ {
_velocity = new PhysicsVector(); _velocity = new PhysicsVector();
_position = pos; _position = pos;
m_taintposition = pos; m_taintposition = pos;
@ -98,8 +96,6 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
m_primName = primName; m_primName = primName;
lock (OdeScene.OdeLock) lock (OdeScene.OdeLock)
{ {
if (mesh != null) if (mesh != null)
@ -243,11 +239,11 @@ namespace OpenSim.Region.Physics.OdePlugin
int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position); int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
if (primScenAvatarIn == "0") if (primScenAvatarIn == "0")
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in space with no prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + " . Arr:': " + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in space with no prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + " . Arr:': " + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in Prim space with prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString()); MainLog.Instance.Verbose("Physics", "Prim " + m_primName + " in Prim space with prim: " + primScenAvatarIn + ". Expected to be at: " + m_targetSpace.ToString() + ". Arr:" + arrayitem[0].ToString() + "," + arrayitem[1].ToString());
} }
m_targetSpace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace); m_targetSpace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
@ -361,13 +357,10 @@ namespace OpenSim.Region.Physics.OdePlugin
enableBody(); enableBody();
d.BodyEnable(Body); d.BodyEnable(Body);
} }
} }
_parent_scene.geom_name_map[prim_geom] = oldname; _parent_scene.geom_name_map[prim_geom] = oldname;
m_taintsize = _size; m_taintsize = _size;
} }
public void changeshape(float timestamp) public void changeshape(float timestamp)
@ -382,9 +375,7 @@ namespace OpenSim.Region.Physics.OdePlugin
d.GeomDestroy(prim_geom); d.GeomDestroy(prim_geom);
if (_mesh != null) if (_mesh != null)
{ {
d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z); d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
} }
// Construction of new prim // Construction of new prim
@ -421,9 +412,6 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
_parent_scene.geom_name_map[prim_geom] = oldname; _parent_scene.geom_name_map[prim_geom] = oldname;
m_taintshape = false; m_taintshape = false;
} }
public override bool IsPhysical public override bool IsPhysical
@ -470,7 +458,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
get { return _position; } get { return _position; }
set set
{ {
_position = value; _position = value;
@ -484,7 +471,6 @@ namespace OpenSim.Region.Physics.OdePlugin
set set
{ {
_size = value; _size = value;
} }
} }
@ -493,7 +479,6 @@ namespace OpenSim.Region.Physics.OdePlugin
set set
{ {
_pbs = value; _pbs = value;
} }
} }
@ -634,7 +619,6 @@ namespace OpenSim.Region.Physics.OdePlugin
base.RequestPhysicsterseUpdate(); base.RequestPhysicsterseUpdate();
m_lastUpdateSent = true; m_lastUpdateSent = true;
} }
} }
else else
{ {

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

@ -31,6 +31,7 @@ using System.Collections.Generic;
using Axiom.Math; using Axiom.Math;
using Ode.NET; using Ode.NET;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
//using OpenSim.Region.Physics.OdePlugin.Meshing; //using OpenSim.Region.Physics.OdePlugin.Meshing;
@ -242,7 +243,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
catch (System.Runtime.InteropServices.SEHException) catch (System.Runtime.InteropServices.SEHException)
{ {
OpenSim.Framework.Console.MainLog.Instance.Error("PHYSICS", "The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim."); MainLog.Instance.Error("PHYSICS", "The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
base.TriggerPhysicsBasedRestart(); base.TriggerPhysicsBasedRestart();
} }
@ -438,7 +439,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString()); MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString());
} }
} }
} }
@ -460,7 +461,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString()); MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'removeprim from scene':" + ((OdePrim)prim).m_targetSpace.ToString());
} }
} }
} }
@ -508,7 +509,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
} }
} }
else else
@ -523,7 +524,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString()); MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString());
} }
} }
} }
@ -543,7 +544,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
} }
} }
@ -561,7 +562,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString()); MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + " Geom:" + geom.ToString());
} }
} }
@ -578,7 +579,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
else else
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString()); MainLog.Instance.Verbose("Physics", "Invalid Scene passed to 'recalculatespace':" + sGeomIsIn.ToString() + " Geom:" + geom.ToString());
} }
} }
@ -612,7 +613,7 @@ namespace OpenSim.Region.Physics.OdePlugin
public IntPtr calculateSpaceForGeom(PhysicsVector pos) public IntPtr calculateSpaceForGeom(PhysicsVector pos)
{ {
int[] xyspace = calculateSpaceArrayItemFromPos(pos); int[] xyspace = calculateSpaceArrayItemFromPos(pos);
//OpenSim.Framework.Console.MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]]; IntPtr locationbasedspace = staticPrimspace[xyspace[0],xyspace[1]];
//locationbasedspace = space; //locationbasedspace = space;
@ -818,7 +819,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
catch (System.StackOverflowException) catch (System.StackOverflowException)
{ {
OpenSim.Framework.Console.MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim."); MainLog.Instance.Error("PHYSICS", "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
base.TriggerPhysicsBasedRestart(); base.TriggerPhysicsBasedRestart();
} }