ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /var/git/opensim/

Browse Source
This commit is contained in:
opensim mirror account
2010-11-02 15:30:08 -07:00
parent 57632db62e 5eeabb8b4b
commit 2dc6c007c2
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -872,6 +872,12 @@ namespace OpenSim.Region.Framework.Scenes
AddToPhysicalScene(isFlying);
if (m_appearance != null)
{
if (m_appearance.AvatarHeight > 0)
SetHeight(m_appearance.AvatarHeight);
}
if (m_forceFly)
{
m_physicsActor.Flying = true;
@@ -2391,11 +2397,14 @@ namespace OpenSim.Region.Framework.Scenes
if (m_appearance.Texture == null)
return;
if (LocalId == remoteAvatar.LocalId)
{
m_log.WarnFormat("[SCENEPRESENCE]: An agent is attempting to send avatar data to itself; {0}", UUID);
return;
}
// MT: This is needed for sit. It's legal to send it to oneself, and the name
// of the method is a misnomer
//
// if (LocalId == remoteAvatar.LocalId)
// {
// m_log.WarnFormat("[SCENEPRESENCE]: An agent is attempting to send avatar data to itself; {0}", UUID);
// return;
// }
if (IsChildAgent)
{