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/Client | |
| 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/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index dbb9611..948a17a 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -427,7 +427,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 427 | pe.ObjectFragment.ObjectIndex = (uint)(m_scene.RegionInfo.RegionSettings.RegionUUID.GetHashCode() + ((long)int.MaxValue) / 2); | 427 | pe.ObjectFragment.ObjectIndex = (uint)(m_scene.RegionInfo.RegionSettings.RegionUUID.GetHashCode() + ((long)int.MaxValue) / 2); |
| 428 | pe.ObjectFragment.ParentObjectId = UUID.Zero.Guid; | 428 | pe.ObjectFragment.ParentObjectId = UUID.Zero.Guid; |
| 429 | pe.ObjectFragment.ObjectName = "Terrain of " + m_scene.RegionInfo.RegionName; | 429 | pe.ObjectFragment.ObjectName = "Terrain of " + m_scene.RegionInfo.RegionName; |
| 430 | pe.ObjectFragment.OwnerId = m_scene.RegionInfo.MasterAvatarAssignedUUID.Guid; | 430 | pe.ObjectFragment.OwnerId = m_scene.RegionInfo.EstateSettings.EstateOwner; |
| 431 | pe.ObjectFragment.TypeId = Guid.Empty; | 431 | pe.ObjectFragment.TypeId = Guid.Empty; |
| 432 | pe.ObjectFragment.TypeName = "Terrain"; | 432 | pe.ObjectFragment.TypeName = "Terrain"; |
| 433 | pe.ObjectFragment.Acceleration = new MsdVector3f(); | 433 | pe.ObjectFragment.Acceleration = new MsdVector3f(); |