diff options
| author | Dr Scofield | 2009-04-22 18:00:59 +0000 |
|---|---|---|
| committer | Dr Scofield | 2009-04-22 18:00:59 +0000 |
| commit | d455d579d03523b98e9f0161716942889b7913c3 (patch) | |
| tree | b504715c1529f2994fc60930f4478b3aed1ae40c /OpenSim/Region/CoreModules/Avatar | |
| parent | Thanks tlaukkan for a patch that Fixes asset cache url forming for MXP join r... (diff) | |
| download | opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.zip opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.tar.gz opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.tar.bz2 opensim-SC-d455d579d03523b98e9f0161716942889b7913c3.tar.xz | |
more cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs index 4daea1f..02ea4cd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs | |||
| @@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups | |||
| 87 | osGroup.GroupName = "OpenSimulator Testing"; | 87 | osGroup.GroupName = "OpenSimulator Testing"; |
| 88 | osGroup.GroupPowers = | 88 | osGroup.GroupPowers = |
| 89 | (uint)(GroupPowers.AllowLandmark | | 89 | (uint)(GroupPowers.AllowLandmark | |
| 90 | GroupPowers.AllowSetHome); | 90 | GroupPowers.AllowSetHome); |
| 91 | m_GroupMap[opensimulatorGroupID] = osGroup; | 91 | m_GroupMap[opensimulatorGroupID] = osGroup; |
| 92 | } | 92 | } |
| 93 | m_SceneList.Add(scene); | 93 | m_SceneList.Add(scene); |
| @@ -96,8 +96,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups | |||
| 96 | 96 | ||
| 97 | scene.EventManager.OnNewClient += OnNewClient; | 97 | scene.EventManager.OnNewClient += OnNewClient; |
| 98 | scene.EventManager.OnClientClosed += OnClientClosed; | 98 | scene.EventManager.OnClientClosed += OnClientClosed; |
| 99 | scene.EventManager.OnIncomingInstantMessage += | 99 | scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; |
| 100 | OnGridInstantMessage; | ||
| 101 | } | 100 | } |
| 102 | 101 | ||
| 103 | public void PostInitialise() | 102 | public void PostInitialise() |
| @@ -152,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups | |||
| 152 | } | 151 | } |
| 153 | 152 | ||
| 154 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, | 153 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, |
| 155 | UUID AgentID, UUID SessionID) | 154 | UUID AgentID, UUID SessionID) |
| 156 | { | 155 | { |
| 157 | UUID ActiveGroupID; | 156 | UUID ActiveGroupID; |
| 158 | string ActiveGroupName; | 157 | string ActiveGroupName; |
| @@ -168,8 +167,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups | |||
| 168 | ActiveGroupPowers = osGroup.GroupPowers; | 167 | ActiveGroupPowers = osGroup.GroupPowers; |
| 169 | 168 | ||
| 170 | remoteClient.SendAgentDataUpdate(AgentID, ActiveGroupID, firstname, | 169 | remoteClient.SendAgentDataUpdate(AgentID, ActiveGroupID, firstname, |
| 171 | lastname, ActiveGroupPowers, ActiveGroupName, | 170 | lastname, ActiveGroupPowers, ActiveGroupName, |
| 172 | ActiveGroupTitle); | 171 | ActiveGroupTitle); |
| 173 | } | 172 | } |
| 174 | 173 | ||
| 175 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) | 174 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) |