diff options
author | Melanie Thielker | 2014-11-11 07:09:30 +0100 |
---|---|---|
committer | Melanie Thielker | 2014-11-11 07:09:30 +0100 |
commit | bec456c2a529ca0b9ca7fd59e8110e5d5b27c126 (patch) | |
tree | fdeb239af06878f6cfb39a137e61adfe04f0baa5 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Merge branch 'avination-current' (diff) | |
download | opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.zip opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.gz opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.bz2 opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.xz |
Remove the Invisible stuff and add more baked caching. Refactor selection of textures to save to Bakes module.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5a3e554..cd9dcf5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -90,7 +90,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
90 | 90 | ||
91 | public bool isNPC { get; private set; } | 91 | public bool isNPC { get; private set; } |
92 | 92 | ||
93 | public bool Invisible { get; set; } | ||
94 | private PresenceType m_presenceType; | 93 | private PresenceType m_presenceType; |
95 | public PresenceType PresenceType { | 94 | public PresenceType PresenceType { |
96 | get {return m_presenceType;} | 95 | get {return m_presenceType;} |
@@ -950,7 +949,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
950 | public ScenePresence( | 949 | public ScenePresence( |
951 | IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type) | 950 | IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type) |
952 | { | 951 | { |
953 | Invisible = false; | ||
954 | AttachmentsSyncLock = new Object(); | 952 | AttachmentsSyncLock = new Object(); |
955 | AllowMovement = true; | 953 | AllowMovement = true; |
956 | IsChildAgent = true; | 954 | IsChildAgent = true; |
@@ -3716,12 +3714,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3716 | 3714 | ||
3717 | public void SendAppearanceToAgentNF(ScenePresence avatar) | 3715 | public void SendAppearanceToAgentNF(ScenePresence avatar) |
3718 | { | 3716 | { |
3719 | if (Invisible) | 3717 | avatar.ControllingClient.SendAppearance( |
3720 | avatar.ControllingClient.SendAppearance( | 3718 | UUID, Appearance.VisualParams, Appearance.Texture.GetBytes()); |
3721 | UUID, Appearance.VisualParams, AvatarAppearance.Invisible.GetBytes()); | ||
3722 | else | ||
3723 | avatar.ControllingClient.SendAppearance( | ||
3724 | UUID, Appearance.VisualParams, Appearance.Texture.GetBytes()); | ||
3725 | } | 3719 | } |
3726 | 3720 | ||
3727 | public void SendAnimPackToAgent(ScenePresence p) | 3721 | public void SendAnimPackToAgent(ScenePresence p) |