summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolcomp.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-11-14 08:49:08 -0500
committerNat Goodspeed <nat@lindenlab.com>2014-11-14 08:49:08 -0500
commit6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch)
tree86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/newview/lltoolcomp.cpp
parent2301cf800f40101baed7a5936683d0b1e4968be1 (diff)
parent316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/lltoolcomp.cpp')
-rwxr-xr-xindra/newview/lltoolcomp.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 4bda9072d0..5a63f6e286 100755
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -52,14 +52,8 @@
#include "llfloatertools.h"
#include "llviewercontrol.h"
-const S32 BUTTON_HEIGHT = 16;
-const S32 BUTTON_WIDTH_SMALL = 32;
-const S32 BUTTON_WIDTH_BIG = 48;
-const S32 HPAD = 4;
-
extern LLControlGroup gSavedSettings;
-
// we use this in various places instead of NULL
static LLPointer<LLTool> sNullTool(new LLTool(std::string("null"), NULL));