livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in the align tool crash fixes.

meow-7.2.2
Liny 2011-01-27 13:58:24 -08:00
parent 29413e4002 9070e31400
commit 4a3461e6fa
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/qtoolalign.cpp
View File

@ -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;
}

2
indra/newview/qtoolalign.h
View File

@ -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();