diff options
author | Teravus Ovares | 2008-05-17 00:16:16 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-17 00:16:16 +0000 |
commit | 349a17f664f661acf97896d4b778368edb822044 (patch) | |
tree | 24893ef56a12a7e758503c79cddcae3263ee2dbc /OpenSim/Region/ClientStack/LindenUDP | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-349a17f664f661acf97896d4b778368edb822044.zip opensim-SC_OLD-349a17f664f661acf97896d4b778368edb822044.tar.gz opensim-SC_OLD-349a17f664f661acf97896d4b778368edb822044.tar.bz2 opensim-SC_OLD-349a17f664f661acf97896d4b778368edb822044.tar.xz |
* Tweaked patch mantis 1302 and committing it.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 180a806..a86941f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -129,6 +129,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
129 | protected LLVector3 m_startpos; | 129 | protected LLVector3 m_startpos; |
130 | protected EndPoint m_userEndPoint; | 130 | protected EndPoint m_userEndPoint; |
131 | protected EndPoint m_proxyEndPoint; | 131 | protected EndPoint m_proxyEndPoint; |
132 | protected LLUUID m_activeGroupID = LLUUID.Zero; | ||
133 | protected string m_activeGroupName = String.Empty; | ||
134 | protected ulong m_activeGroupPowers = 0; | ||
132 | 135 | ||
133 | /* Instantiated Designated Event Delegates */ | 136 | /* Instantiated Designated Event Delegates */ |
134 | //- used so we don't create new objects for each incoming packet and then toss it out later */ | 137 | //- used so we don't create new objects for each incoming packet and then toss it out later */ |
@@ -274,6 +277,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
274 | get { return m_agentId; } | 277 | get { return m_agentId; } |
275 | } | 278 | } |
276 | 279 | ||
280 | public LLUUID ActiveGroupId | ||
281 | { | ||
282 | get { return m_activeGroupID; } | ||
283 | } | ||
284 | |||
285 | public string ActiveGroupName | ||
286 | { | ||
287 | get { return m_activeGroupName; } | ||
288 | } | ||
289 | |||
290 | public ulong ActiveGroupPowers | ||
291 | { | ||
292 | get { return m_activeGroupPowers; } | ||
293 | } | ||
294 | |||
277 | /// <summary> | 295 | /// <summary> |
278 | /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. | 296 | /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. |
279 | /// </summary> | 297 | /// </summary> |
@@ -1691,6 +1709,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1691 | 1709 | ||
1692 | public void SendAgentDataUpdate(LLUUID agentid, LLUUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) | 1710 | public void SendAgentDataUpdate(LLUUID agentid, LLUUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) |
1693 | { | 1711 | { |
1712 | |||
1713 | m_activeGroupID = activegroupid; | ||
1714 | m_activeGroupName = groupname; | ||
1715 | m_activeGroupPowers = grouppowers; | ||
1716 | |||
1694 | AgentDataUpdatePacket sendAgentDataUpdate = (AgentDataUpdatePacket)PacketPool.Instance.GetPacket(PacketType.AgentDataUpdate); | 1717 | AgentDataUpdatePacket sendAgentDataUpdate = (AgentDataUpdatePacket)PacketPool.Instance.GetPacket(PacketType.AgentDataUpdate); |
1695 | sendAgentDataUpdate.AgentData.ActiveGroupID = activegroupid; | 1718 | sendAgentDataUpdate.AgentData.ActiveGroupID = activegroupid; |
1696 | sendAgentDataUpdate.AgentData.AgentID = agentid; | 1719 | sendAgentDataUpdate.AgentData.AgentID = agentid; |