Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
commit
3113cc9129
|
@ -2865,22 +2865,28 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
lock (m_syncRoot)
|
||||
{
|
||||
if (m_physicsActor != null)
|
||||
{
|
||||
if (!IsChildAgent)
|
||||
{
|
||||
// This may seem like it's redundant, remove the avatar from the physics scene
|
||||
// just to add it back again, but it saves us from having to update
|
||||
// 3 variables 10 times a second.
|
||||
bool flyingTemp = m_physicsActor.Flying;
|
||||
RemoveFromPhysicalScene();
|
||||
//m_scene.PhysicsScene.RemoveAvatar(m_physicsActor);
|
||||
|
||||
//PhysicsActor = null;
|
||||
|
||||
AddToPhysicalScene(flyingTemp);
|
||||
}
|
||||
}
|
||||
// MT: Commented this because it's no longer needed.
|
||||
// It used to be that the avatar height was calculated from the visual
|
||||
// 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
|
||||
// changes here. So, we can leave physics alone.
|
||||
//
|
||||
// if (m_physicsActor != null)
|
||||
// {
|
||||
// if (!IsChildAgent)
|
||||
// {
|
||||
// // This may seem like it's redundant, remove the avatar from the physics scene
|
||||
// // just to add it back again, but it saves us from having to update
|
||||
// // 3 variables 10 times a second.
|
||||
// bool flyingTemp = m_physicsActor.Flying;
|
||||
// RemoveFromPhysicalScene();
|
||||
// //m_scene.PhysicsScene.RemoveAvatar(m_physicsActor);
|
||||
//
|
||||
// //PhysicsActor = null;
|
||||
//
|
||||
// AddToPhysicalScene(flyingTemp);
|
||||
// }
|
||||
// }
|
||||
|
||||
#region Bake Cache Check
|
||||
|
||||
|
|
|
@ -10777,6 +10777,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
|
||||
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
|
||||
|
|
|
@ -398,6 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
|||
LSL_Vector llWind(LSL_Vector offset);
|
||||
LSL_String llXorBase64Strings(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);
|
||||
LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
|
||||
|
|
|
@ -1849,5 +1849,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
{
|
||||
return m_LSL_Functions.llClearPrimMedia(face);
|
||||
}
|
||||
|
||||
public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
|
||||
{
|
||||
return m_LSL_Functions.llGetLinkNumberOfSides(link);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue