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

Remove the m_Viewer variable and make the property a shortcut to the 

proper field in AgentCircuitData instead
slimupdates2
Melanie Thielker 2010-05-06 02:02:12 +02:00 committed by Melanie
parent ad2039a8c4
commit 2b48ed60ec
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2651,10 +2651,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence sp = CreateAndAddScenePresence(client); ScenePresence sp = CreateAndAddScenePresence(client);
if (aCircuit != null) if (aCircuit != null)
{
sp.Appearance = aCircuit.Appearance; sp.Appearance = aCircuit.Appearance;
sp.Viewer = aCircuit.Viewer;
}
// HERE!!! Do the initial attachments right here // HERE!!! Do the initial attachments right here
// first agent upon login is a root agent by design. // first agent upon login is a root agent by design.

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

@ -218,8 +218,6 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_followCamAuto; private bool m_followCamAuto;
private int m_movementUpdateCount; private int m_movementUpdateCount;
private string m_Viewer = String.Empty;
private const int NumMovementsBetweenRayCast = 5; private const int NumMovementsBetweenRayCast = 5;
private bool CameraConstraintActive; private bool CameraConstraintActive;
@ -654,8 +652,7 @@ namespace OpenSim.Region.Framework.Scenes
public string Viewer public string Viewer
{ {
get { return m_Viewer; } get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
set { m_Viewer = value; }
} }
#endregion #endregion