Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
commit
c9d39359bb
|
@ -1415,8 +1415,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (m_followCamAuto)
|
||||
{
|
||||
if (hitYN)
|
||||
if (hitYN && localid != LocalId)
|
||||
{
|
||||
|
||||
CameraConstraintActive = true;
|
||||
//m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance);
|
||||
|
||||
|
@ -2282,7 +2283,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
|
||||
return;
|
||||
}
|
||||
// m_log.InfoFormat("physsit {0} {1}", offset.ToString(),Orientation.ToString());
|
||||
|
||||
RemoveFromPhysicalScene();
|
||||
|
||||
|
@ -2293,7 +2293,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
part.AddSittingAvatar(UUID);
|
||||
|
||||
|
||||
Vector3 cameraAtOffset = part.GetCameraAtOffset();
|
||||
Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
|
||||
bool forceMouselook = part.GetForceMouselook();
|
||||
|
|
Loading…
Reference in New Issue