diff options
author | Melanie Thielker | 2014-11-10 19:49:58 +0100 |
---|---|---|
committer | Melanie Thielker | 2014-11-10 19:49:58 +0100 |
commit | 64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83 (patch) | |
tree | 378293301b9e187fc8821537e09d51e89a05e9d6 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Remove JustinCCs UDP patch - it is harmful to Avination's grid management (diff) | |
download | opensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.zip opensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.tar.gz opensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.tar.bz2 opensim-SC-64deb6ae6fdf586bcd2e940d3cbf3ee54367dc83.tar.xz |
Second part of invisible base avatar option
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7086b52..5a3e554 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -90,6 +90,7 @@ 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; } | ||
93 | private PresenceType m_presenceType; | 94 | private PresenceType m_presenceType; |
94 | public PresenceType PresenceType { | 95 | public PresenceType PresenceType { |
95 | get {return m_presenceType;} | 96 | get {return m_presenceType;} |
@@ -949,6 +950,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
949 | public ScenePresence( | 950 | public ScenePresence( |
950 | IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type) | 951 | IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type) |
951 | { | 952 | { |
953 | Invisible = false; | ||
952 | AttachmentsSyncLock = new Object(); | 954 | AttachmentsSyncLock = new Object(); |
953 | AllowMovement = true; | 955 | AllowMovement = true; |
954 | IsChildAgent = true; | 956 | IsChildAgent = true; |
@@ -3709,14 +3711,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
3709 | // "[SCENE PRESENCE]: Sending appearance data from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID); | 3711 | // "[SCENE PRESENCE]: Sending appearance data from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID); |
3710 | if (ParcelHideThisAvatar && currentParcelUUID != avatar.currentParcelUUID && avatar.GodLevel < 200) | 3712 | if (ParcelHideThisAvatar && currentParcelUUID != avatar.currentParcelUUID && avatar.GodLevel < 200) |
3711 | return; | 3713 | return; |
3712 | avatar.ControllingClient.SendAppearance( | 3714 | SendAppearanceToAgentNF(avatar); |
3713 | UUID, Appearance.VisualParams, Appearance.Texture.GetBytes()); | ||
3714 | } | 3715 | } |
3715 | 3716 | ||
3716 | public void SendAppearanceToAgentNF(ScenePresence avatar) | 3717 | public void SendAppearanceToAgentNF(ScenePresence avatar) |
3717 | { | 3718 | { |
3718 | avatar.ControllingClient.SendAppearance( | 3719 | if (Invisible) |
3719 | UUID, Appearance.VisualParams, Appearance.Texture.GetBytes()); | 3720 | avatar.ControllingClient.SendAppearance( |
3721 | UUID, Appearance.VisualParams, AvatarAppearance.Invisible.GetBytes()); | ||
3722 | else | ||
3723 | avatar.ControllingClient.SendAppearance( | ||
3724 | UUID, Appearance.VisualParams, Appearance.Texture.GetBytes()); | ||
3720 | } | 3725 | } |
3721 | 3726 | ||
3722 | public void SendAnimPackToAgent(ScenePresence p) | 3727 | public void SendAnimPackToAgent(ScenePresence p) |