diff options
| author | Justin Clark-Casey (justincc) | 2010-03-26 19:57:11 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-03-26 19:57:11 +0000 |
| commit | 24ca202daba21d032d17e933e93960b534765bee (patch) | |
| tree | ff9380821e1caa08ebb6223118607fdd6d90de79 /OpenSim | |
| parent | fix nant related build break (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-24ca202daba21d032d17e933e93960b534765bee.zip opensim-SC_OLD-24ca202daba21d032d17e933e93960b534765bee.tar.gz opensim-SC_OLD-24ca202daba21d032d17e933e93960b534765bee.tar.bz2 opensim-SC_OLD-24ca202daba21d032d17e933e93960b534765bee.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index b011295..eb630de 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
| @@ -1193,8 +1193,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 1193 | else | 1193 | else |
| 1194 | { | 1194 | { |
| 1195 | string domain = string.Empty; //m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; | 1195 | string domain = string.Empty; //m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; |
| 1196 | if (account.ServiceURLs["HomeURI"] != null) | 1196 | object homeUriObj; |
| 1197 | domain = account.ServiceURLs["HomeURI"].ToString(); | 1197 | if (account.ServiceURLs.TryGetValue("HomeURI", out homeUriObj) && homeUriObj != null) |
| 1198 | domain = homeUriObj.ToString(); | ||
| 1198 | // They're a local user, use this: | 1199 | // They're a local user, use this: |
| 1199 | info.RequestID.UserServiceURL = domain; | 1200 | info.RequestID.UserServiceURL = domain; |
| 1200 | } | 1201 | } |