aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewercamera.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewercamera.cpp')
-rw-r--r--linden/indra/newview/llviewercamera.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index fecab65..69a5621 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -131,9 +131,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
131 131
132 mLastPointOfInterest = point_of_interest; 132 mLastPointOfInterest = point_of_interest;
133 133
134 // constrain to max distance from avatar
135 LLVector3 camera_offset = center - gAgent.getPositionAgent();
136
137 LLViewerRegion * regp = gAgent.getRegion(); 134 LLViewerRegion * regp = gAgent.getRegion();
138 F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f; 135 F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f;
139 136
@@ -306,7 +303,7 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
306{ 303{
307 F32 fov_y, aspect; 304 F32 fov_y, aspect;
308 fov_y = RAD_TO_DEG * getView(); 305 fov_y = RAD_TO_DEG * getView();
309 BOOL z_default_near, z_default_far = FALSE; 306 BOOL z_default_far = FALSE;
310 if (z_far <= 0) 307 if (z_far <= 0)
311 { 308 {
312 z_default_far = TRUE; 309 z_default_far = TRUE;
@@ -314,7 +311,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
314 } 311 }
315 if (z_near <= 0) 312 if (z_near <= 0)
316 { 313 {
317 z_default_near = TRUE;
318 z_near = getNear(); 314 z_near = getNear();
319 } 315 }
320 aspect = getAspect(); 316 aspect = getAspect();