OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-06-21 10:43:00 +02:00
parent d068468f53 909572ed86
commit 9b5f840d19
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -585,12 +585,12 @@ namespace OpenSim.Region.Framework.Scenes
protected internal void AddPhysicalPrim(int number) protected internal void AddPhysicalPrim(int number)
{ {
m_physicalPrim++; m_physicalPrim += number;
} }
protected internal void RemovePhysicalPrim(int number) protected internal void RemovePhysicalPrim(int number)
{ {
m_physicalPrim--; m_physicalPrim -= number;
} }
protected internal void AddToScriptLPS(int number) protected internal void AddToScriptLPS(int number)

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -8026,7 +8026,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Quaternion srot = sitpart.RotationOffset; Quaternion srot = sitpart.RotationOffset;
rot = Quaternion.Conjugate(srot) * rot; // removed sit part offset rotation rot = Quaternion.Conjugate(srot) * rot; // removed sit part offset rotation
av.Rotation = rot; av.Rotation = rot;
av.SendAvatarDataToAllAgents(); // av.SendAvatarDataToAllAgents();
av.SendTerseUpdateToAllClients();
} }
break; break;
@ -8046,7 +8047,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
rot = Quaternion.Conjugate(srot) * rot; // remove sit part offset rotation rot = Quaternion.Conjugate(srot) * rot; // remove sit part offset rotation
} }
av.Rotation = rot; av.Rotation = rot;
av.SendAvatarDataToAllAgents(); // av.SendAvatarDataToAllAgents();
av.SendTerseUpdateToAllClients();
} }
break; break;
@ -8141,7 +8143,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
positionChanged = false; positionChanged = false;
av.OffsetPosition = finalPos; av.OffsetPosition = finalPos;
av.SendAvatarDataToAllAgents(); // av.SendAvatarDataToAllAgents();
av.SendTerseUpdateToAllClients();
} }
LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++); LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++);
@ -8157,7 +8160,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (positionChanged) if (positionChanged)
{ {
av.OffsetPosition = finalPos; av.OffsetPosition = finalPos;
av.SendAvatarDataToAllAgents(); // av.SendAvatarDataToAllAgents();
av.SendTerseUpdateToAllClients();
positionChanged = false; positionChanged = false;
} }
} }