summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-12-04 16:09:15 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-12-04 16:09:15 -0500
commitd69a0e692e420e5b95e9bcb4ad1e7c5cfa283468 (patch)
treedba5f50b894e52ad961f599702f3da801e3518b9 /indra/newview/llfloatertools.h
parentc4de6b93d3c3f182fc7bf28e5c285e4d14da0764 (diff)
parent6ed6158ac68076b6a6242a3a74a3394846227e04 (diff)
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-leap-test
Diffstat (limited to 'indra/newview/llfloatertools.h')
-rwxr-xr-xindra/newview/llfloatertools.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index df481b8d4c..8f586f7da6 100755
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -198,6 +198,7 @@ public:
private:
BOOL mDirty;
+ BOOL mHasSelection;
std::map<std::string, std::string> mStatusText;