1 files changed, 12 insertions, 12 deletions

diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 926a117..7b1c8cc 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -52,7 +52,7 @@
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
 #include "pipeline.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerimagelist.h"
 
 //static
@@ -617,7 +617,7 @@ LLImagePreviewAvatar::LLImagePreviewAvatar(S32 width, S32 height) : LLDynamicTex
         mDummyAvatar->slamPosition();
         mDummyAvatar->updateJointLODs();
         mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-        // gPipeline.markVisible(mDummyAvatar->mDrawable, *gCamera);
+        // gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance());
 
         mTextureName = 0;
 }
@@ -697,16 +697,16 @@ BOOL LLImagePreviewAvatar::render()
                 LLQuaternion(mCameraYaw, LLVector3::z_axis);
 
         LLQuaternion av_rot = avatarp->mPelvisp->getWorldRotation() * camera_rot;
-        gCamera->setOriginAndLookAt(
+        LLViewerCamera::getInstance()->setOriginAndLookAt(
                 target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot),         // camera
                 LLVector3::z_axis,                                                                                                                                      // up
                 target_pos + (mCameraOffset  * av_rot) );                                                                                       // point of interest
 
         stop_glerror();
 
-        gCamera->setAspect((F32)mWidth / mHeight);
-        gCamera->setView(gCamera->getDefaultFOV() / mCameraZoom);
-        gCamera->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
+        LLViewerCamera::getInstance()->setAspect((F32)mWidth / mHeight);
+        LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
+        LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
 
         LLVertexBuffer::stopRender();
         avatarp->updateLOD();
@@ -788,7 +788,7 @@ LLImagePreviewSculpted::LLImagePreviewSculpted(S32 width, S32 height) : LLDynami
         mDummyAvatar->slamPosition();
         mDummyAvatar->updateJointLODs();
         mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-        gPipeline.markVisible(mDummyAvatar->mDrawable, *gCamera);
+        gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance());
         mTextureName = 0;
         */
 }
@@ -857,16 +857,16 @@ BOOL LLImagePreviewSculpted::render()
                 LLQuaternion(mCameraYaw, LLVector3::z_axis);
 
         LLQuaternion av_rot = camera_rot;
-        gCamera->setOriginAndLookAt(
+        LLViewerCamera::getInstance()->setOriginAndLookAt(
                 target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot),         // camera
                 LLVector3::z_axis,                                                                                                                                      // up
                 target_pos + (mCameraOffset  * av_rot) );                                                                                       // point of interest
 
         stop_glerror();
 
-        gCamera->setAspect((F32) mWidth / mHeight);
-        gCamera->setView(gCamera->getDefaultFOV() / mCameraZoom);
-        gCamera->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
+        LLViewerCamera::getInstance()->setAspect((F32) mWidth / mHeight);
+        LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
+        LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
 
         gPipeline.enableLightsAvatar();
                 
@@ -907,7 +907,7 @@ BOOL LLImagePreviewSculpted::render()
                 gGL.color3f(0.4f, 0.4f, 0.4f);
                 glVertexPointer(3, GL_FLOAT, 0, (void *)vertices);
                 glNormalPointer(GL_FLOAT, 0, (void *)normals);
-                glDrawRangeElements(GL_TRIANGLES, 0, num_indices-1, num_indices, GL_UNSIGNED_SHORT, (void *)indices);
+                glDrawRangeElements(GL_TRIANGLES, 0, num_vertices-1, num_indices, GL_UNSIGNED_SHORT, (void *)indices);
                 
                 gGL.popMatrix();
                 glDisableClientState(GL_NORMAL_ARRAY);