diff options
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 19 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs | 22 |
2 files changed, 20 insertions, 21 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 62918a7..52ad5c2 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -7202,7 +7202,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7202 | i++; | 7202 | i++; |
7203 | } | 7203 | } |
7204 | 7204 | ||
7205 | |||
7206 | OutPacket(groupRoleMembersReply, ThrottleOutPacketType.Task); | 7205 | OutPacket(groupRoleMembersReply, ThrottleOutPacketType.Task); |
7207 | } | 7206 | } |
7208 | break; | 7207 | break; |
@@ -7213,15 +7212,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7213 | 7212 | ||
7214 | if (m_GroupsModule != null) | 7213 | if (m_GroupsModule != null) |
7215 | { | 7214 | { |
7216 | UUID groupID = m_GroupsModule.CreateGroup(this, | 7215 | m_GroupsModule.CreateGroup(this, |
7217 | Utils.BytesToString(createGroupRequest.GroupData.Name), | 7216 | Utils.BytesToString(createGroupRequest.GroupData.Name), |
7218 | Utils.BytesToString(createGroupRequest.GroupData.Charter), | 7217 | Utils.BytesToString(createGroupRequest.GroupData.Charter), |
7219 | createGroupRequest.GroupData.ShowInList, | 7218 | createGroupRequest.GroupData.ShowInList, |
7220 | createGroupRequest.GroupData.InsigniaID, | 7219 | createGroupRequest.GroupData.InsigniaID, |
7221 | createGroupRequest.GroupData.MembershipFee, | 7220 | createGroupRequest.GroupData.MembershipFee, |
7222 | createGroupRequest.GroupData.OpenEnrollment, | 7221 | createGroupRequest.GroupData.OpenEnrollment, |
7223 | createGroupRequest.GroupData.AllowPublish, | 7222 | createGroupRequest.GroupData.AllowPublish, |
7224 | createGroupRequest.GroupData.MaturePublish); | 7223 | createGroupRequest.GroupData.MaturePublish); |
7225 | } | 7224 | } |
7226 | break; | 7225 | break; |
7227 | 7226 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs index f19696e..d3e5b45 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs | |||
@@ -110,17 +110,17 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList | |||
110 | public void Close() | 110 | public void Close() |
111 | { | 111 | { |
112 | } | 112 | } |
113 | 113 | ||
114 | private IClientAPI FindClient(UUID agentID) | 114 | // private IClientAPI FindClient(UUID agentID) |
115 | { | 115 | // { |
116 | foreach (Scene s in m_SceneList) | 116 | // foreach (Scene s in m_SceneList) |
117 | { | 117 | // { |
118 | ScenePresence presence = s.GetScenePresence(agentID); | 118 | // ScenePresence presence = s.GetScenePresence(agentID); |
119 | if (presence != null && !presence.IsChildAgent) | 119 | // if (presence != null && !presence.IsChildAgent) |
120 | return presence.ControllingClient; | 120 | // return presence.ControllingClient; |
121 | } | 121 | // } |
122 | return null; | 122 | // return null; |
123 | } | 123 | // } |
124 | 124 | ||
125 | private void OnNewClient(IClientAPI client) | 125 | private void OnNewClient(IClientAPI client) |
126 | { | 126 | { |