Remove the m_Viewer variable and make the property a shortcut to the
proper field in AgentCircuitData insteadavinationmerge
parent
7e0d5b8665
commit
02dea4ce58
|
@ -2679,10 +2679,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
ScenePresence sp = CreateAndAddScenePresence(client);
|
||||
if (aCircuit != null)
|
||||
{
|
||||
sp.Appearance = aCircuit.Appearance;
|
||||
sp.Viewer = aCircuit.Viewer;
|
||||
}
|
||||
|
||||
// HERE!!! Do the initial attachments right here
|
||||
// first agent upon login is a root agent by design.
|
||||
|
|
|
@ -227,8 +227,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
private int m_lastColCount = -1; //KF: Look for Collision chnages
|
||||
private int m_updateCount = 0; //KF: Update Anims for a while
|
||||
private static readonly int UPDATE_COUNT = 10; // how many frames to update for
|
||||
private string m_Viewer = String.Empty;
|
||||
|
||||
private const int NumMovementsBetweenRayCast = 5;
|
||||
|
||||
private bool CameraConstraintActive;
|
||||
|
@ -667,8 +665,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
public string Viewer
|
||||
{
|
||||
get { return m_Viewer; }
|
||||
set { m_Viewer = value; }
|
||||
get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
Loading…
Reference in New Issue