diff options
| author | Diva Canto | 2010-01-10 15:35:15 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-10 15:35:15 -0800 |
| commit | c0642bf7e06924397894229677235e2a841768bc (patch) | |
| tree | 3d052597318fd29e107662ab29bb831ff8380582 /OpenSim/Framework/Communications | |
| parent | * Changed IPresenceService Logout, so that it takes a position and a lookat (diff) | |
| parent | Remove all references to master avatar, replacing with estate owner where (diff) | |
| download | opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.zip opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.gz opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.bz2 opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Framework/Communications')
| -rw-r--r-- | OpenSim/Framework/Communications/Clients/GridClient.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Clients/GridClient.cs b/OpenSim/Framework/Communications/Clients/GridClient.cs index 4836556..0198d75 100644 --- a/OpenSim/Framework/Communications/Clients/GridClient.cs +++ b/OpenSim/Framework/Communications/Clients/GridClient.cs | |||
| @@ -68,10 +68,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
| 68 | GridParams["region_secret"] = regionInfo.regionSecret; | 68 | GridParams["region_secret"] = regionInfo.regionSecret; |
| 69 | GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString(); | 69 | GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString(); |
| 70 | 70 | ||
| 71 | if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero) | 71 | GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); |
| 72 | GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); | ||
| 73 | else | ||
| 74 | GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); | ||
| 75 | 72 | ||
| 76 | // Package into an XMLRPC Request | 73 | // Package into an XMLRPC Request |
| 77 | ArrayList SendParams = new ArrayList(); | 74 | ArrayList SendParams = new ArrayList(); |