aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-26 19:32:41 +0000
committerMelanie Thielker2008-10-26 19:32:41 +0000
commitf7e44250bf6058a7f232b5555d709787f1a2eb6b (patch)
treef9197d06761c96d1b47f0b4dd56cef8aca6bf4b5 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentThank you kindly, Idb for a patch that solves: (diff)
downloadopensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.zip
opensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.tar.gz
opensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.tar.bz2
opensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.tar.xz
Committing a small fix for EventData along with more plumbing work
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs22
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index a8476fd..38427cf 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -284,6 +284,14 @@ namespace OpenSim.Region.Environment.Scenes
284 get { return m_lastname; } 284 get { return m_lastname; }
285 } 285 }
286 286
287 private string m_grouptitle;
288
289 public string Grouptitle
290 {
291 get { return m_grouptitle; }
292 set { m_grouptitle = value; }
293 }
294
287 public float DrawDistance 295 public float DrawDistance
288 { 296 {
289 get { return m_DrawDistance; } 297 get { return m_DrawDistance; }
@@ -484,6 +492,10 @@ namespace OpenSim.Region.Environment.Scenes
484 m_regionInfo = reginfo; 492 m_regionInfo = reginfo;
485 m_localId = m_scene.NextLocalId; 493 m_localId = m_scene.NextLocalId;
486 494
495 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
496 if (gm != null)
497 m_grouptitle = gm.GetGroupTitle(m_uuid);
498
487 AbsolutePosition = m_controllingClient.StartPos; 499 AbsolutePosition = m_controllingClient.StartPos;
488 500
489 TrySetMovementAnimation("STAND"); // TODO: I think, this won't send anything, as we are still a child here... 501 TrySetMovementAnimation("STAND"); // TODO: I think, this won't send anything, as we are still a child here...
@@ -691,6 +703,10 @@ namespace OpenSim.Region.Environment.Scenes
691 /// </summary> 703 /// </summary>
692 public void MakeRootAgent(Vector3 pos, bool isFlying) 704 public void MakeRootAgent(Vector3 pos, bool isFlying)
693 { 705 {
706 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
707 if (gm != null)
708 m_grouptitle = gm.GetGroupTitle(m_uuid);
709
694 m_scene.SetRootAgentScene(m_uuid); 710 m_scene.SetRootAgentScene(m_uuid);
695 711
696 IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>(); 712 IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>();
@@ -1755,7 +1771,7 @@ namespace OpenSim.Region.Environment.Scenes
1755 // Note: because Quaternion is a struct, it can't be null 1771 // Note: because Quaternion is a struct, it can't be null
1756 Quaternion rot = m_bodyRot; 1772 Quaternion rot = m_bodyRot;
1757 1773
1758 remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, 1774 remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid,
1759 LocalId, m_pos, m_appearance.Texture.ToBytes(), 1775 LocalId, m_pos, m_appearance.Texture.ToBytes(),
1760 m_parentID, rot); 1776 m_parentID, rot);
1761 m_scene.AddAgentUpdates(1); 1777 m_scene.AddAgentUpdates(1);
@@ -1804,6 +1820,8 @@ namespace OpenSim.Region.Environment.Scenes
1804 } 1820 }
1805 m_scene.AddAgentUpdates(avatars.Count); 1821 m_scene.AddAgentUpdates(avatars.Count);
1806 m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); 1822 m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS);
1823
1824 SendAnimPack();
1807 } 1825 }
1808 1826
1809 /// <summary> 1827 /// <summary>
@@ -1818,7 +1836,7 @@ namespace OpenSim.Region.Environment.Scenes
1818 // Note: because Quaternion is a struct, it can't be null 1836 // Note: because Quaternion is a struct, it can't be null
1819 Quaternion rot = m_bodyRot; 1837 Quaternion rot = m_bodyRot;
1820 1838
1821 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, 1839 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
1822 m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot); 1840 m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot);
1823 1841
1824 if (!m_isChildAgent) 1842 if (!m_isChildAgent)