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

merge

meow-7.2.2
Arrehn 2011-01-21 17:46:25 -05:00
parent 1bbff1ac31 27bf828209
commit b409a7dc6e
8 changed files with 734 additions and 674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/lllineeditor.cpp
View File

@ -1308,6 +1308,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
{
if( mCurrentHistoryLine > mLineHistory.begin() )
{
(*mCurrentHistoryLine).assign(getText());
mText.assign( *(--mCurrentHistoryLine) );
setCursorToEnd();
}

22
indra/newview/app_settings/settings.xml
View File

@ -9303,6 +9303,28 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowMeButton</key>
<map>
<key>Comment</key>
<string>Shows/Hides profile sidebar button in the bottom tray.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowPlacesButton</key>
<map>
<key>Comment</key>
<string>Shows/Hides the places sidebar button in the bottom tray.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowMoveButton</key>
<map>
<key>Comment</key>

8
indra/newview/llbottomtray.cpp
View File

@ -1565,6 +1565,8 @@ void LLBottomTray::initResizeStateContainers()
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_WORLD_MAP, getChild<LLPanel>("world_map_btn_panel")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_MINI_MAP, getChild<LLPanel>("mini_map_btn_panel")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_HOME, getChild<LLPanel>("bottom_sbhome")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_ME, getChild<LLPanel>("bottom_sbme")));
mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_PLACES, getChild<LLPanel>("bottom_sbplaces")));
// init an order of processed buttons
mButtonsProcessOrder.push_back(RS_BUTTON_GESTURES);
@ -1576,6 +1578,8 @@ void LLBottomTray::initResizeStateContainers()
mButtonsProcessOrder.push_back(RS_BUTTON_WORLD_MAP);
mButtonsProcessOrder.push_back(RS_BUTTON_MINI_MAP);
mButtonsProcessOrder.push_back(RS_BUTTON_HOME);
mButtonsProcessOrder.push_back(RS_BUTTON_ME);
mButtonsProcessOrder.push_back(RS_BUTTON_PLACES);
mButtonsOrder.push_back(RS_BUTTON_SPEAK);
mButtonsOrder.insert(mButtonsOrder.end(), mButtonsProcessOrder.begin(), mButtonsProcessOrder.end());
@ -1615,6 +1619,8 @@ void LLBottomTray::initButtonsVisibility()
setVisibleAndFitWidths(RS_BUTTON_WORLD_MAP, gSavedSettings.getBOOL("ShowWorldMapButton"));
setVisibleAndFitWidths(RS_BUTTON_MINI_MAP, gSavedSettings.getBOOL("ShowMiniMapButton"));
setVisibleAndFitWidths(RS_BUTTON_HOME, gSavedSettings.getBOOL("ShowHomeButton"));
setVisibleAndFitWidths(RS_BUTTON_ME, gSavedSettings.getBOOL("ShowMeButton"));
setVisibleAndFitWidths(RS_BUTTON_PLACES, gSavedSettings.getBOOL("ShowPlacesButton"));
}
void LLBottomTray::setButtonsControlsAndListeners()
@ -1628,6 +1634,8 @@ void LLBottomTray::setButtonsControlsAndListeners()
gSavedSettings.getControl("ShowWorldMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_WORLD_MAP, _2));
gSavedSettings.getControl("ShowMiniMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_MINI_MAP, _2));
gSavedSettings.getControl("ShowHomeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_HOME, _2));
gSavedSettings.getControl("ShowMeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_ME, _2));
gSavedSettings.getControl("ShowPlacesButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_PLACES, _2));
LLButton* build_btn = getChild<LLButton>("build_btn");

3
indra/newview/llbottomtray.h
View File

@ -155,6 +155,8 @@ private:
, RS_BUTTON_WORLD_MAP = 0x0800
, RS_BUTTON_MINI_MAP = 0x1000
, RS_BUTTON_HOME = 0x2000
, RS_BUTTON_ME = 0x4000
, RS_BUTTON_PLACES = 0x8000
/*
Once new button that can be hidden on resize is added don't forget to update related places:
@ -169,6 +171,7 @@ private:
*/
, RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES
| RS_BUTTON_BUILD | RS_BUTTON_SEARCH | RS_BUTTON_WORLD_MAP | RS_BUTTON_MINI_MAP | RS_BUTTON_HOME
| RS_BUTTON_ME | RS_BUTTON_PLACES
}EResizeState;
// Below are three methods that were introduced to handle drag'n'drop

16
indra/newview/llinventoryfilter.cpp
View File

@ -409,16 +409,20 @@ void LLInventoryFilter::setFilterSubString(const std::string& string)
{
if (mFilterSubString != string)
{
std::string filterSubStringNew = string;
LLStringUtil::trimHead(filterSubStringNew);
mFilterSubStringOrig = filterSubStringNew;
LLStringUtil::toUpper(filterSubStringNew);
// hitting BACKSPACE, for example
const BOOL less_restrictive = mFilterSubString.size() >= string.size() && !mFilterSubString.substr(0, string.size()).compare(string);
const BOOL less_restrictive = mFilterSubString.size() >= filterSubStringNew.size()
&& !mFilterSubString.substr(0, filterSubStringNew.size()).compare(filterSubStringNew);
// appending new characters
const BOOL more_restrictive = mFilterSubString.size() < string.size() && !string.substr(0, mFilterSubString.size()).compare(mFilterSubString);
const BOOL more_restrictive = mFilterSubString.size() < filterSubStringNew.size()
&& !filterSubStringNew.substr(0, mFilterSubString.size()).compare(mFilterSubString);
mFilterSubStringOrig = string;
LLStringUtil::trimHead(mFilterSubStringOrig);
mFilterSubString = mFilterSubStringOrig;
LLStringUtil::toUpper(mFilterSubString);
mFilterSubString = filterSubStringNew;
if (less_restrictive)
{
setModified(FILTER_LESS_RESTRICTIVE);

2
indra/newview/skins/default/xui/en/floater_camera.xml
View File

@ -244,7 +244,7 @@
</panel>
<panel
border="false"
height="69"
height="81"
layout="topleft"
left="186"
top="20"

22
indra/newview/skins/default/xui/en/menu_bottomtray.xml
View File

@ -107,6 +107,28 @@
function="CheckControl"
parameter="ShowHomeButton" />
</menu_item_check>
<menu_item_check
label="Profile Button"
layout="topleft"
name="ShowMeButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowMeButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowMeButton" />
</menu_item_check>
<menu_item_check
label="Places Button"
layout="topleft"
name="ShowPlacesButton">
<menu_item_check.on_click
function="ToggleControl"
parameter="ShowPlacesButton" />
<menu_item_check.on_check
function="CheckControl"
parameter="ShowPlacesButton" />
</menu_item_check>
<menu_item_separator
name="Separator" />
<menu_item_call

1334
indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
View File

File diff suppressed because it is too large Load Diff