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

merge

meow-7.2.2
Steve Bennetts 2009-11-17 23:39:42 -08:00
parent 063dcf7307 9a33ed34b4
commit 125b779fb6
11 changed files with 172 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/llcombobox.cpp
View File

@ -102,7 +102,6 @@ LLComboBox::LLComboBox(const LLComboBox::Params& p)
mMaxChars(p.max_chars),
mPrearrangeCallback(p.prearrange_callback()),
mTextEntryCallback(p.text_entry_callback()),
mSelectionCallback(p.selection_callback()),
mListPosition(p.list_position),
mLastSelectedIndex(-1)
{
@ -721,12 +720,6 @@ void LLComboBox::onItemSelected(const LLSD& data)
// commit does the reverse, asserting the value in the list
onCommit();
// call the callback if it exists
if(mSelectionCallback)
{
mSelectionCallback(this, data);
}
}
BOOL LLComboBox::handleToolTip(S32 x, S32 y, MASK mask)

4
indra/llui/llcombobox.h
View File

@ -82,8 +82,7 @@ public:
allow_new_values;
Optional<S32> max_chars;
Optional<commit_callback_t> prearrange_callback,
text_entry_callback,
selection_callback;
text_entry_callback;
Optional<EPreferredPosition, PreferredPositionValues> list_position;
@ -200,7 +199,6 @@ public:
void setPrearrangeCallback( commit_callback_t cb ) { mPrearrangeCallback = cb; }
void setTextEntryCallback( commit_callback_t cb ) { mTextEntryCallback = cb; }
void setSelectionCallback( commit_callback_t cb ) { mSelectionCallback = cb; }
void setButtonVisible(BOOL visible);

4
indra/newview/llfloateruipreview.cpp
View File

@ -431,9 +431,9 @@ BOOL LLFloaterUIPreview::postBuild()
// get pointers to buttons and link to callbacks
mLanguageSelection = main_panel_tmp->getChild<LLComboBox>("language_select_combo");
mLanguageSelection->setSelectionCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection));
mLanguageSelection->setCommitCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection));
mLanguageSelection_2 = main_panel_tmp->getChild<LLComboBox>("language_select_combo_2");
mLanguageSelection_2->setSelectionCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection));
mLanguageSelection_2->setCommitCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection));
LLPanel* editor_panel_tmp = main_panel_tmp->getChild<LLPanel>("editor_panel");
mDisplayFloaterBtn = main_panel_tmp->getChild<LLButton>("display_floater");
mDisplayFloaterBtn->setClickedCallback(boost::bind(&LLFloaterUIPreview::onClickDisplayFloater, this, PRIMARY_FLOATER));

2
indra/newview/llnavigationbar.cpp
View File

@ -217,7 +217,7 @@ BOOL LLNavigationBar::postBuild()
mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this));
mCmbLocation->setSelectionCallback(boost::bind(&LLNavigationBar::onLocationSelection, this));
mCmbLocation->setCommitCallback(boost::bind(&LLNavigationBar::onLocationSelection, this));
mSearchComboBox->setCommitCallback(boost::bind(&LLNavigationBar::onSearchCommit, this));

2
indra/newview/llpanelplaces.cpp
View File

@ -222,7 +222,7 @@ BOOL LLPanelPlaces::postBuild()
notes_editor->setKeystrokeCallback(boost::bind(&LLPanelPlaces::onEditButtonClicked, this));
LLComboBox* folder_combo = mLandmarkInfo->getChild<LLComboBox>("folder_combo");
folder_combo->setSelectionCallback(boost::bind(&LLPanelPlaces::onEditButtonClicked, this));
folder_combo->setCommitCallback(boost::bind(&LLPanelPlaces::onEditButtonClicked, this));
return TRUE;
}

2
indra/newview/llsearchcombobox.cpp
View File

@ -82,7 +82,7 @@ LLSearchComboBox::LLSearchComboBox(const Params&p)
setButtonVisible(p.dropdown_button_visible);
mTextEntry->setCommitCallback(boost::bind(&LLComboBox::onTextCommit, this, _2));
mTextEntry->setKeystrokeCallback(boost::bind(&LLComboBox::onTextEntry, this, _1), NULL);
setSelectionCallback(boost::bind(&LLSearchComboBox::onSelectionCommit, this));
setCommitCallback(boost::bind(&LLSearchComboBox::onSelectionCommit, this));
setPrearrangeCallback(boost::bind(&LLSearchComboBox::onSearchPrearrange, this, _2));
mSearchButton->setCommitCallback(boost::bind(&LLSearchComboBox::onTextCommit, this, _2));
}

2
indra/newview/lltexturecache.cpp
View File

@ -917,7 +917,7 @@ BOOL LLTextureCache::isInLocal(const LLUUID& id)
//static
const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB
F32 LLTextureCache::sHeaderCacheVersion = 1.3f;
F32 LLTextureCache::sHeaderCacheVersion = 1.4f;
U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE;
S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
const char* entries_filename = "texture.entries";

2
indra/newview/llviewermenu.cpp
View File

@ -5189,7 +5189,7 @@ void show_debug_menus()
gMenuBarView->setItemEnabled("Develop", qamode);
// Server ('Admin') menu hidden when not in godmode.
const bool show_server_menu = debug && (gAgent.getGodLevel() > GOD_NOT || gAgent.getAdminOverride());
const bool show_server_menu = (gAgent.getGodLevel() > GOD_NOT || (debug && gAgent.getAdminOverride()));
gMenuBarView->setItemVisible("Admin", show_server_menu);
gMenuBarView->setItemEnabled("Admin", show_server_menu);
}

2
indra/newview/llviewerwindow.cpp
View File

@ -3942,7 +3942,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
return FALSE ;
}
BOOL high_res = scale_factor > 1.f;
BOOL high_res = scale_factor >= 2.f; // Font scaling is slow, only do so if rez is much higher
if (high_res)
{
send_agent_pause();

322
indra/newview/skins/default/xui/en/floater_stats.xml
View File

@ -405,179 +405,179 @@
show_bar="false"
show_mean="false" >
</stat_bar>
</stat_view>
<stat_bar
name="simagentups"
label="Agent Updates/Sec"
stat="simagentups"
precision="1"
bar_min="0.f"
bar_max="100.f"
tick_spacing="25.f"
label_spacing="50.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simagentups"
label="Agent Updates/Sec"
stat="simagentups"
precision="1"
bar_min="0.f"
bar_max="100.f"
tick_spacing="25.f"
label_spacing="50.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simmainagents"
label="Main Agents"
stat="simmainagents"
precision="0"
bar_min="0.f"
bar_max="80.f"
tick_spacing="10.f"
label_spacing="40.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simmainagents"
label="Main Agents"
stat="simmainagents"
precision="0"
bar_min="0.f"
bar_max="80.f"
tick_spacing="10.f"
label_spacing="40.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simchildagents"
label="Child Agents"
stat="simchildagents"
precision="0"
bar_min="0.f"
bar_max="40.f"
tick_spacing="5.f"
label_spacing="10.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simchildagents"
label="Child Agents"
stat="simchildagents"
precision="0"
bar_min="0.f"
bar_max="40.f"
tick_spacing="5.f"
label_spacing="10.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simobjects"
label="Objects"
stat="simobjects"
precision="0"
bar_min="0.f"
bar_max="30000.f"
tick_spacing="5000.f"
label_spacing="10000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simobjects"
label="Objects"
stat="simobjects"
precision="0"
bar_min="0.f"
bar_max="30000.f"
tick_spacing="5000.f"
label_spacing="10000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simactiveobjects"
label="Active Objects"
stat="simactiveobjects"
precision="0"
bar_min="0.f"
bar_max="800.f"
tick_spacing="100.f"
label_spacing="200.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simactiveobjects"
label="Active Objects"
stat="simactiveobjects"
precision="0"
bar_min="0.f"
bar_max="800.f"
tick_spacing="100.f"
label_spacing="200.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simactivescripts"
label="Active Scripts"
stat="simactivescripts"
precision="0"
bar_min="0.f"
bar_max="800.f"
tick_spacing="100.f"
label_spacing="200.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simactivescripts"
label="Active Scripts"
stat="simactivescripts"
precision="0"
bar_min="0.f"
bar_max="800.f"
tick_spacing="100.f"
label_spacing="200.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simscripteps"
label="Script Events"
stat="simscripteps"
unit_label="eps"
precision="0"
bar_min="0.f"
bar_max="20000.f"
tick_spacing="2500.f"
label_spacing="5000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simscripteps"
label="Script Events"
stat="simscripteps"
unit_label="eps"
precision="0"
bar_min="0.f"
bar_max="20000.f"
tick_spacing="2500.f"
label_spacing="5000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="siminpps"
label="Packets In"
stat="siminpps"
unit_label="pps"
precision="0"
bar_min="0.f"
bar_max="2000.f"
tick_spacing="250.f"
label_spacing="1000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="siminpps"
label="Packets In"
stat="siminpps"
unit_label="pps"
precision="0"
bar_min="0.f"
bar_max="2000.f"
tick_spacing="250.f"
label_spacing="1000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simoutpps"
label="Packets Out"
stat="simoutpps"
unit_label="pps"
precision="0"
bar_min="0.f"
bar_max="2000.f"
tick_spacing="250.f"
label_spacing="1000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simoutpps"
label="Packets Out"
stat="simoutpps"
unit_label="pps"
precision="0"
bar_min="0.f"
bar_max="2000.f"
tick_spacing="250.f"
label_spacing="1000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simpendingdownloads"
label="Pending Downloads"
stat="simpendingdownloads"
precision="0"
bar_min="0.f"
bar_max="800.f"
tick_spacing="100.f"
label_spacing="200.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simpendingdownloads"
label="Pending Downloads"
stat="simpendingdownloads"
precision="0"
bar_min="0.f"
bar_max="800.f"
tick_spacing="100.f"
label_spacing="200.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simpendinguploads"
label="Pending Uploads"
stat="simpendinguploads"
precision="0"
bar_min="0.f"
bar_max="100.f"
tick_spacing="25.f"
label_spacing="50.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simpendinguploads"
label="Pending Uploads"
stat="simpendinguploads"
precision="0"
bar_min="0.f"
bar_max="100.f"
tick_spacing="25.f"
label_spacing="50.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simtotalunackedbytes"
label="Total Unacked Bytes"
stat="simtotalunackedbytes"
unit_label="kb"
precision="0"
bar_min="0.f"
bar_max="100000.f"
tick_spacing="25000.f"
label_spacing="50000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
</stat_view>
<stat_bar
name="simtotalunackedbytes"
label="Total Unacked Bytes"
stat="simtotalunackedbytes"
unit_label="kb"
precision="0"
bar_min="0.f"
bar_max="100000.f"
tick_spacing="25000.f"
label_spacing="50000.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_view
name="simperf"

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

@ -340,6 +340,8 @@
label="Landmarks"
name="item1"
value="None" />
<combo_box.commit_callback
function="WMap.Landmark"/>
</combo_box>
<icon
color="0.5 0 0 1"