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

Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie 2010-10-25 01:24:42 +01:00
parent ac370cf57b cf78f3fae3
commit 3113cc9129
4 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2865,22 +2865,28 @@ namespace OpenSim.Region.Framework.Scenes
{ {
lock (m_syncRoot) lock (m_syncRoot)
{ {
if (m_physicsActor != null) // MT: Commented this because it's no longer needed.
{ // It used to be that the avatar height was calculated from the visual
if (!IsChildAgent) // params, so any call to this method could change the physical actor's
{ // height. Now the height is supplied in the agent circuit data and never
// This may seem like it's redundant, remove the avatar from the physics scene // changes here. So, we can leave physics alone.
// just to add it back again, but it saves us from having to update //
// 3 variables 10 times a second. // if (m_physicsActor != null)
bool flyingTemp = m_physicsActor.Flying; // {
RemoveFromPhysicalScene(); // if (!IsChildAgent)
//m_scene.PhysicsScene.RemoveAvatar(m_physicsActor); // {
// // This may seem like it's redundant, remove the avatar from the physics scene
//PhysicsActor = null; // // just to add it back again, but it saves us from having to update
// // 3 variables 10 times a second.
AddToPhysicalScene(flyingTemp); // bool flyingTemp = m_physicsActor.Flying;
} // RemoveFromPhysicalScene();
} // //m_scene.PhysicsScene.RemoveAvatar(m_physicsActor);
//
// //PhysicsActor = null;
//
// AddToPhysicalScene(flyingTemp);
// }
// }
#region Bake Cache Check #region Bake Cache Check

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

@ -10777,6 +10777,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return GetLinkPrimitiveParams(obj, rules); return GetLinkPrimitiveParams(obj, rules);
} }
public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
{
List<SceneObjectPart> parts = GetLinkParts(link);
if (parts.Count < 1)
return 0;
return GetNumberOfSides(parts[0]);
}
} }
public class NotecardCache public class NotecardCache

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@ -398,6 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Vector llWind(LSL_Vector offset); LSL_Vector llWind(LSL_Vector offset);
LSL_String llXorBase64Strings(string str1, string str2); LSL_String llXorBase64Strings(string str1, string str2);
LSL_String llXorBase64StringsCorrect(string str1, string str2); LSL_String llXorBase64StringsCorrect(string str1, string str2);
LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@ -1849,5 +1849,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{ {
return m_LSL_Functions.llClearPrimMedia(face); return m_LSL_Functions.llClearPrimMedia(face);
} }
public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
{
return m_LSL_Functions.llGetLinkNumberOfSides(link);
}
} }
} }