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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-21 20:05:11 +01:00
parent 8159fd7110 7ec7a3cf33
commit c9c40343af
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/Null/NullSimulationData.cs
View File

@ -77,8 +77,10 @@ namespace OpenSim.Data.Null
} }
public RegionSettings LoadRegionSettings(UUID regionUUID) public RegionSettings LoadRegionSettings(UUID regionUUID)
{ {
return null; RegionSettings rs = new RegionSettings();
rs.RegionUUID = regionUUID;
return rs;
} }
public void StoreObject(SceneObjectGroup obj, UUID regionUUID) public void StoreObject(SceneObjectGroup obj, UUID regionUUID)

24
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// ~ScenePresence() // ~ScenePresence()
// { // {
// m_log.Debug("[ScenePresence] Destructor called"); // m_log.Debug("[SCENE PRESENCE] Destructor called");
// } // }
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -517,7 +517,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[SCENEPRESENCE]: ABSOLUTE POSITION " + e.Message); m_log.Error("[SCENE PRESENCE]: ABSOLUTE POSITION " + e.Message);
} }
} }
@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[SCENEPRESENCE]: VELOCITY " + e.Message); m_log.Error("[SCENE PRESENCE]: VELOCITY " + e.Message);
} }
} }
@ -1012,7 +1012,7 @@ namespace OpenSim.Region.Framework.Scenes
Animator.ResetAnimations(); Animator.ResetAnimations();
// m_log.DebugFormat( // m_log.DebugFormat(
// "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", // "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
// Name, UUID, m_scene.RegionInfo.RegionName); // Name, UUID, m_scene.RegionInfo.RegionName);
// Don't zero out the velocity since this can cause problems when an avatar is making a region crossing, // Don't zero out the velocity since this can cause problems when an avatar is making a region crossing,
@ -1179,7 +1179,7 @@ namespace OpenSim.Region.Framework.Scenes
m_callbackURI = null; m_callbackURI = null;
} }
//m_log.DebugFormat("Completed movement"); m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
SendInitialData(); SendInitialData();
@ -2435,7 +2435,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 pos = m_pos; Vector3 pos = m_pos;
pos.Z += m_appearance.HipOffset; pos.Z += m_appearance.HipOffset;
//m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity);
remoteClient.SendPrimUpdate( remoteClient.SendPrimUpdate(
this, this,
@ -2522,6 +2522,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
private void SendInitialData() private void SendInitialData()
{ {
m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID);
// Moved this into CompleteMovement to ensure that m_appearance is initialized before // Moved this into CompleteMovement to ensure that m_appearance is initialized before
// the inventory arrives // the inventory arrives
// m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
@ -2566,10 +2567,11 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void SendAvatarDataToAllAgents() public void SendAvatarDataToAllAgents()
{ {
m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID);
// only send update from root agents to other clients; children are only "listening posts" // only send update from root agents to other clients; children are only "listening posts"
if (IsChildAgent) if (IsChildAgent)
{ {
m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent");
return; return;
} }
@ -2619,7 +2621,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="avatar"></param> /// <param name="avatar"></param>
public void SendAvatarDataToAgent(ScenePresence avatar) public void SendAvatarDataToAgent(ScenePresence avatar)
{ {
// m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID);
avatar.ControllingClient.SendAvatarDataImmediate(this); avatar.ControllingClient.SendAvatarDataImmediate(this);
if (Animator != null) if (Animator != null)
@ -2632,10 +2634,11 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void SendAppearanceToAllOtherAgents() public void SendAppearanceToAllOtherAgents()
{ {
m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} ({1})", Name, UUID);
// only send update from root agents to other clients; children are only "listening posts" // only send update from root agents to other clients; children are only "listening posts"
if (IsChildAgent) if (IsChildAgent)
{ {
m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent");
return; return;
} }
@ -2661,6 +2664,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void SendOtherAgentsAppearanceToMe() public void SendOtherAgentsAppearanceToMe()
{ {
m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID);
m_perfMonMS = Util.EnvironmentTickCount(); m_perfMonMS = Util.EnvironmentTickCount();
int count = 0; int count = 0;
@ -3845,4 +3849,4 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
} }