diff options
| author | Melanie | 2009-11-18 06:20:21 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-18 06:20:21 +0000 |
| commit | 5d0778014df68b48abb08c8f63204cf7e077af7f (patch) | |
| tree | 5f6ef28958950412130f68fa3bbe1491a456eef7 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change PresenceData to PresenceInfo to remove a naming conflict in the (diff) | |
| download | opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.zip opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.gz opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.bz2 opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index f24869b..8d32e66 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
| @@ -1179,8 +1179,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 1179 | 1179 | ||
| 1180 | return m_clientRequestIDInfo[client.AgentId].RequestID; | 1180 | return m_clientRequestIDInfo[client.AgentId].RequestID; |
| 1181 | } | 1181 | } |
| 1182 | 1182 | // Unreachable code! | |
| 1183 | return new GroupRequestID(); | 1183 | // return new GroupRequestID(); |
| 1184 | } | 1184 | } |
| 1185 | 1185 | ||
| 1186 | /// <summary> | 1186 | /// <summary> |