From 9070e3140022b5e0c0deab08cdeb53385fc961fa Mon Sep 17 00:00:00 2001 From: Liny Date: Thu, 27 Jan 2011 13:55:07 -0800 Subject: [PATCH] Fixing the prim align tool to not crash on attempting to use. --- indra/newview/qtoolalign.cpp | 2 -- indra/newview/qtoolalign.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/indra/newview/qtoolalign.cpp b/indra/newview/qtoolalign.cpp index c8726bc989..dc01f3cb07 100644 --- a/indra/newview/qtoolalign.cpp +++ b/indra/newview/qtoolalign.cpp @@ -31,14 +31,12 @@ const F32 MANIPULATOR_SELECT_SIZE = 20.0; -QToolAlign* QToolAlign::sInstance = NULL; AlignThread* AlignThread::sInstance = NULL; void cmdline_printchat(std::string message); QToolAlign::QToolAlign() : LLTool(std::string("Align")) { - sInstance = this; } diff --git a/indra/newview/qtoolalign.h b/indra/newview/qtoolalign.h index 2b65fcb4f0..dfd513206b 100644 --- a/indra/newview/qtoolalign.h +++ b/indra/newview/qtoolalign.h @@ -39,7 +39,6 @@ public: static void pickCallback(const LLPickInfo& pick_info); static void aligndone(); - static QToolAlign* getInstance(){ return sInstance; } LLBBox mBBox; F32 mManipulatorSize; @@ -48,7 +47,6 @@ public: BOOL mForce; private: - static QToolAlign* sInstance; void align(); void computeManipulatorSize(); void renderManipulators();