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 2013-01-07 11:37:25 +01:00
parent aa44a65d24 ca40e656ab
commit c9d39359bb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1415,8 +1415,9 @@ namespace OpenSim.Region.Framework.Scenes
if (m_followCamAuto) if (m_followCamAuto)
{ {
if (hitYN) if (hitYN && localid != LocalId)
{ {
CameraConstraintActive = true; CameraConstraintActive = true;
//m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance); //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"); ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
return; return;
} }
// m_log.InfoFormat("physsit {0} {1}", offset.ToString(),Orientation.ToString());
RemoveFromPhysicalScene(); RemoveFromPhysicalScene();
@ -2293,7 +2293,6 @@ namespace OpenSim.Region.Framework.Scenes
part.AddSittingAvatar(UUID); part.AddSittingAvatar(UUID);
Vector3 cameraAtOffset = part.GetCameraAtOffset(); Vector3 cameraAtOffset = part.GetCameraAtOffset();
Vector3 cameraEyeOffset = part.GetCameraEyeOffset(); Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
bool forceMouselook = part.GetForceMouselook(); bool forceMouselook = part.GetForceMouselook();