Merge remote branch 'mccabe/1.2.0-next' into next

Moved "Backup" pie menu item to fit "Go Here" in top-left slot.

Conflicts:
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml

1 files changed, 4 insertions, 1 deletions

diff --git a/linden/indra/newview/lltoolbrush.h b/linden/indra/newview/lltoolbrush.h
index 8df4b67..f25d6b9 100644
--- a/linden/indra/newview/lltoolbrush.h
+++ b/linden/indra/newview/lltoolbrush.h
@@ -95,11 +95,14 @@ protected:
         F32 mStartingZ;
         S32 mMouseX;
         S32 mMouseY;
-        S32 mBrushIndex;
+        F32 mBrushSize;
         BOOL mGotHover;
         BOOL mBrushSelected;
         // Order doesn't matter and we do check for existance of regions, so use a set
         region_list_t mLastAffectedRegions;
+
+private:
+        U8 getBrushIndex();
 };