[Floater Flexibility] Part three and a half: Toolbar code cleanup, toolbar in mouselook option
Go into Preferences->Input and Camera, to find the new option~ Thanks to Cinder for checking that the mac changes build and look nice.
This commit is contained in:
@@ -41,10 +41,6 @@
|
||||
// "Constants" loaded from settings.xml at start time
|
||||
extern S32 TOOL_BAR_HEIGHT;
|
||||
|
||||
#if LL_DARWIN
|
||||
class LLFakeResizeHandle;
|
||||
#endif // LL_DARWIN
|
||||
|
||||
class LLFlyoutButton;
|
||||
|
||||
class LLToolBar
|
||||
@@ -62,11 +58,6 @@ public:
|
||||
EAcceptance* accept,
|
||||
std::string& tooltip_msg);
|
||||
|
||||
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
|
||||
|
||||
// Move buttons to appropriate locations based on rect.
|
||||
void layoutButtons();
|
||||
|
||||
// Per-frame refresh call
|
||||
void refresh();
|
||||
|
||||
@@ -79,12 +70,8 @@ private:
|
||||
void updateCommunicateList();
|
||||
|
||||
private:
|
||||
BOOL mInventoryAutoOpen;
|
||||
LLFrameTimer mInventoryAutoOpenTimer;
|
||||
S32 mNumUnreadIMs;
|
||||
#if LL_DARWIN
|
||||
LLFakeResizeHandle *mResizeHandle;
|
||||
#endif // LL_DARWIN
|
||||
|
||||
CachedUICtrl<LLFlyoutButton> mCommunicateBtn;
|
||||
CachedUICtrl<LLButton> mFlyBtn;
|
||||
|
||||
Reference in New Issue
Block a user