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

Merge before push

meow-7.2.2
callum 2009-10-22 18:11:23 -07:00
parent 318e4784d2 07ffe9c149
commit 0e6c92ec06
5 changed files with 181 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
indra/newview/llfloaterregioninfo.cpp
View File

@ -442,32 +442,31 @@ LLPanelRegionInfo::LLPanelRegionInfo()
{
}
// static
void LLPanelRegionInfo::onBtnSet(void* user_data)
void LLPanelRegionInfo::onBtnSet()
{
LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
if(!panel) return;
if (panel->sendUpdate())
if (sendUpdate())
{
panel->disableButton("apply_btn");
disableButton("apply_btn");
}
}
//static
void LLPanelRegionInfo::onChangeChildCtrl(LLUICtrl* ctrl, void* user_data)
void LLPanelRegionInfo::onChangeChildCtrl(LLUICtrl* ctrl)
{
if (ctrl)
{
LLPanelRegionInfo* panel = (LLPanelRegionInfo*) ctrl->getParent();
panel->updateChild(ctrl);
}
updateChild(ctrl); // virtual function
}
// static
// Enables the "set" button if it is not already enabled
void LLPanelRegionInfo::onChangeAnything(LLUICtrl* ctrl, void* user_data)
void LLPanelRegionInfo::onChangeAnything()
{
LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
enableButton("apply_btn");
refresh();
}
// static
// Enables set button on change to line editor
void LLPanelRegionInfo::onChangeText(LLLineEditor* caller, void* user_data)
{
LLPanelRegionInfo* panel = dynamic_cast<LLPanelRegionInfo*>(caller->getParent());
if(panel)
{
panel->enableButton("apply_btn");
@ -475,19 +474,11 @@ void LLPanelRegionInfo::onChangeAnything(LLUICtrl* ctrl, void* user_data)
}
}
// static
// Enables set button on change to line editor
void LLPanelRegionInfo::onChangeText(LLLineEditor* caller, void* user_data)
{
// reuse the previous method
onChangeAnything(0, user_data);
}
// virtual
BOOL LLPanelRegionInfo::postBuild()
{
childSetAction("apply_btn", onBtnSet, this);
getChild<LLUICtrl>("apply_btn")->setCommitCallback(boost::bind(&LLPanelRegionInfo::onBtnSet, this));
childDisable("apply_btn");
refresh();
return TRUE;
@ -550,19 +541,17 @@ void LLPanelRegionInfo::disableButton(const std::string& btn_name)
void LLPanelRegionInfo::initCtrl(const std::string& name)
{
childSetCommitCallback(name, onChangeAnything, this);
getChild<LLUICtrl>(name)->setCommitCallback(boost::bind(&LLPanelRegionInfo::onChangeAnything, this));
}
void LLPanelRegionInfo::initHelpBtn(const std::string& name, const std::string& xml_alert)
{
childSetAction(name, onClickHelp, new std::string(xml_alert));
getChild<LLUICtrl>(name)->setCommitCallback(boost::bind(&LLPanelRegionInfo::onClickHelp, this, xml_alert));
}
// static
void LLPanelRegionInfo::onClickHelp(void* data)
void LLPanelRegionInfo::onClickHelp(std::string xml_alert)
{
std::string* xml_alert = (std::string*)data;
LLNotifications::instance().add(*xml_alert);
LLNotifications::instance().add(xml_alert);
}
/////////////////////////////////////////////////////////////////////////////
@ -1207,9 +1196,9 @@ BOOL LLPanelRegionTerrainInfo::postBuild()
initCtrl("terrain_lower_spin");
initCtrl("fixed_sun_check");
childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
childSetCommitCallback("use_estate_sun_check", onChangeUseEstateTime, this);
childSetCommitCallback("sun_hour_slider", onChangeSunHour, this);
getChild<LLUICtrl>("fixed_sun_check")->setCommitCallback(boost::bind(&LLPanelRegionTerrainInfo::onChangeFixedSun, this));
getChild<LLUICtrl>("use_estate_sun_check")->setCommitCallback(boost::bind(&LLPanelRegionTerrainInfo::onChangeUseEstateTime, this));
getChild<LLUICtrl>("sun_hour_slider")->setCommitCallback(boost::bind(&LLPanelRegionTerrainInfo::onChangeSunHour, this));
childSetAction("download_raw_btn", onClickDownloadRaw, this);
childSetAction("upload_raw_btn", onClickUploadRaw, this);
@ -1292,39 +1281,29 @@ BOOL LLPanelRegionTerrainInfo::sendUpdate()
return TRUE;
}
// static
void LLPanelRegionTerrainInfo::onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data)
void LLPanelRegionTerrainInfo::onChangeUseEstateTime()
{
LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
if (!panel) return;
BOOL use_estate_sun = panel->childGetValue("use_estate_sun_check").asBoolean();
panel->childSetEnabled("fixed_sun_check", !use_estate_sun);
panel->childSetEnabled("sun_hour_slider", !use_estate_sun);
BOOL use_estate_sun = childGetValue("use_estate_sun_check").asBoolean();
childSetEnabled("fixed_sun_check", !use_estate_sun);
childSetEnabled("sun_hour_slider", !use_estate_sun);
if (use_estate_sun)
{
panel->childSetValue("fixed_sun_check", LLSD(FALSE));
panel->childSetValue("sun_hour_slider", LLSD(0.f));
childSetValue("fixed_sun_check", LLSD(FALSE));
childSetValue("sun_hour_slider", LLSD(0.f));
}
panel->childEnable("apply_btn");
childEnable("apply_btn");
}
// static
void LLPanelRegionTerrainInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
void LLPanelRegionTerrainInfo::onChangeFixedSun()
{
LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
if (!panel) return;
// Just enable the apply button. We let the sun-hour slider be enabled
// for both fixed-sun and non-fixed-sun. JC
panel->childEnable("apply_btn");
childEnable("apply_btn");
}
// static
void LLPanelRegionTerrainInfo::onChangeSunHour(LLUICtrl* ctrl, void*)
void LLPanelRegionTerrainInfo::onChangeSunHour()
{
// can't use userdata to get panel, slider uses it internally
LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) ctrl->getParent();
if (!panel) return;
panel->childEnable("apply_btn");
childEnable("apply_btn");
}
// static
@ -1420,32 +1399,23 @@ void LLPanelEstateInfo::initDispatch(LLDispatcher& dispatch)
estate_dispatch_initialized = true;
}
// static
// Disables the sun-hour slider and the use fixed time check if the use global time is check
void LLPanelEstateInfo::onChangeUseGlobalTime(LLUICtrl* ctrl, void* user_data)
void LLPanelEstateInfo::onChangeUseGlobalTime()
{
LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
if (panel)
{
bool enabled = !panel->childGetValue("use_global_time_check").asBoolean();
panel->childSetEnabled("sun_hour_slider", enabled);
panel->childSetEnabled("fixed_sun_check", enabled);
panel->childSetValue("fixed_sun_check", LLSD(FALSE));
panel->enableButton("apply_btn");
}
bool enabled = !childGetValue("use_global_time_check").asBoolean();
childSetEnabled("sun_hour_slider", enabled);
childSetEnabled("fixed_sun_check", enabled);
childSetValue("fixed_sun_check", LLSD(FALSE));
enableButton("apply_btn");
}
// Enables the sun-hour slider if the fixed-sun checkbox is set
void LLPanelEstateInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
void LLPanelEstateInfo::onChangeFixedSun()
{
LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
if (panel)
{
bool enabled = !panel->childGetValue("fixed_sun_check").asBoolean();
panel->childSetEnabled("use_global_time_check", enabled);
panel->childSetValue("use_global_time_check", LLSD(FALSE));
panel->enableButton("apply_btn");
}
bool enabled = !childGetValue("fixed_sun_check").asBoolean();
childSetEnabled("use_global_time_check", enabled);
childSetValue("use_global_time_check", LLSD(FALSE));
enableButton("apply_btn");
}
@ -2130,7 +2100,7 @@ BOOL LLPanelEstateInfo::postBuild()
initCtrl("limit_payment");
initCtrl("limit_age_verified");
initCtrl("voice_chat_check");
childSetCommitCallback("abuse_email_address", onChangeAnything, this);
getChild<LLUICtrl>("abuse_email_address")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeAnything, this));
getChild<LLLineEditor>("abuse_email_address")->setKeystrokeCallback(onChangeText, this);
initHelpBtn("estate_manager_help", "HelpEstateEstateManager");
@ -2144,15 +2114,15 @@ BOOL LLPanelEstateInfo::postBuild()
initHelpBtn("allow_resident_help", "HelpEstateAllowResident");
initHelpBtn("allow_group_help", "HelpEstateAllowGroup");
initHelpBtn("ban_resident_help", "HelpEstateBanResident");
initHelpBtn("abuse_email_address_help", "HelpEstateAbuseEmailAddress");
initHelpBtn("voice_chat_help", "HelpEstateVoiceChat");
initHelpBtn("abuse_email_address_help", "HelpEstateAbuseEmailAddress");
initHelpBtn("voice_chat_help", "HelpEstateVoiceChat");
// set up the use global time checkbox
childSetCommitCallback("use_global_time_check", onChangeUseGlobalTime, this);
childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
childSetCommitCallback("sun_hour_slider", onChangeChildCtrl, this);
childSetCommitCallback("allowed_avatar_name_list", onChangeChildCtrl, this);
getChild<LLUICtrl>("use_global_time_check")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeUseGlobalTime, this));
getChild<LLUICtrl>("fixed_sun_check")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeFixedSun, this));
getChild<LLUICtrl>("sun_hour_slider")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
getChild<LLUICtrl>("allowed_avatar_name_list")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
if (avatar_name_list)
{
@ -2163,7 +2133,7 @@ BOOL LLPanelEstateInfo::postBuild()
childSetAction("add_allowed_avatar_btn", onClickAddAllowedAgent, this);
childSetAction("remove_allowed_avatar_btn", onClickRemoveAllowedAgent, this);
childSetCommitCallback("allowed_group_name_list", onChangeChildCtrl, this);
getChild<LLUICtrl>("allowed_group_name_list")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
LLNameListCtrl* group_name_list = getChild<LLNameListCtrl>("allowed_group_name_list");
if (group_name_list)
{
@ -2174,7 +2144,7 @@ BOOL LLPanelEstateInfo::postBuild()
getChild<LLUICtrl>("add_allowed_group_btn")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onClickAddAllowedGroup, this));
childSetAction("remove_allowed_group_btn", onClickRemoveAllowedGroup, this);
childSetCommitCallback("banned_avatar_name_list", onChangeChildCtrl, this);
getChild<LLUICtrl>("banned_avatar_name_list")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
LLNameListCtrl* banned_name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
if (banned_name_list)
{
@ -2185,7 +2155,7 @@ BOOL LLPanelEstateInfo::postBuild()
childSetAction("add_banned_avatar_btn", onClickAddBannedAgent, this);
childSetAction("remove_banned_avatar_btn", onClickRemoveBannedAgent, this);
childSetCommitCallback("estate_manager_name_list", onChangeChildCtrl, this);
getChild<LLUICtrl>("estate_manager_name_list")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onChangeChildCtrl, this, _1));
LLNameListCtrl* manager_name_list = getChild<LLNameListCtrl>("estate_manager_name_list");
if (manager_name_list)
{
@ -2299,13 +2269,18 @@ void LLPanelEstateInfo::getEstateOwner()
class LLEstateChangeInfoResponder : public LLHTTPClient::Responder
{
public:
LLEstateChangeInfoResponder(void* userdata) : mpPanel((LLPanelEstateInfo*)userdata) {};
LLEstateChangeInfoResponder(LLPanelEstateInfo* panel)
{
mpPanel = panel->getHandle();
}
// if we get a normal response, handle it here
virtual void result(const LLSD& content)
{
// refresh the panel from the database
mpPanel->refresh();
LLPanelEstateInfo* panel = dynamic_cast<LLPanelEstateInfo*>(mpPanel.get());
if (panel)
panel->refresh();
}
// if we get an error response
@ -2315,7 +2290,7 @@ public:
<< status << ": " << reason << llendl;
}
private:
LLPanelEstateInfo* mpPanel;
LLHandle<LLPanel> mpPanel;
};
// tries to send estate info using a cap; returns true if it succeeded
@ -2353,7 +2328,7 @@ bool LLPanelEstateInfo::commitEstateInfoCaps()
body["owner_abuse_email"] = childGetValue("abuse_email_address").asString();
// we use a responder so that we can re-get the data after committing to the database
LLHTTPClient::post(url, body, new LLEstateChangeInfoResponder((void*)this));
LLHTTPClient::post(url, body, new LLEstateChangeInfoResponder(this));
return true;
}

18
indra/newview/llfloaterregioninfo.h
View File

@ -109,9 +109,9 @@ class LLPanelRegionInfo : public LLPanel
public:
LLPanelRegionInfo();
static void onBtnSet(void* user_data);
static void onChangeChildCtrl(LLUICtrl* ctrl, void* user_data);
static void onChangeAnything(LLUICtrl* ctrl, void* user_data);
void onBtnSet();
void onChangeChildCtrl(LLUICtrl* ctrl);
void onChangeAnything();
static void onChangeText(LLLineEditor* caller, void* user_data);
virtual bool refreshFromRegion(LLViewerRegion* region);
@ -128,7 +128,7 @@ protected:
void initHelpBtn(const std::string& name, const std::string& xml_alert);
// Callback for all help buttons, data is name of XML alert to show.
static void onClickHelp(void* data);
void onClickHelp(std::string xml_alert);
// Returns TRUE if update sent and apply button should be
// disabled.
@ -239,9 +239,9 @@ public:
protected:
virtual BOOL sendUpdate();
static void onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data);
static void onChangeFixedSun(LLUICtrl* ctrl, void* user_data);
static void onChangeSunHour(LLUICtrl* ctrl, void*);
void onChangeUseEstateTime();
void onChangeFixedSun();
void onChangeSunHour();
static void onClickDownloadRaw(void*);
static void onClickUploadRaw(void*);
@ -256,8 +256,8 @@ class LLPanelEstateInfo : public LLPanelRegionInfo
public:
static void initDispatch(LLDispatcher& dispatch);
static void onChangeFixedSun(LLUICtrl* ctrl, void* user_data);
static void onChangeUseGlobalTime(LLUICtrl* ctrl, void* user_data);
void onChangeFixedSun();
void onChangeUseGlobalTime();
static void onClickEditSky(void* userdata);
static void onClickEditSkyHelp(void* userdata);

153
indra/newview/llsidetray.cpp
View File

@ -111,12 +111,72 @@ bool LLSideTray::instanceCreated ()
return sInstance!=0;
}
LLSideTrayTab::LLSideTrayTab(const Params& params):mMainPanel(0)
{
mImagePath = params.image_path;
mTabTitle = params.tab_title;
mDescription = params.description;
//////////////////////////////////////////////////////////////////////////////
// LLSideTrayTab
// Represents a single tab in the side tray, only used by LLSideTray
//////////////////////////////////////////////////////////////////////////////
class LLSideTrayTab: public LLPanel
{
friend class LLUICtrlFactory;
friend class LLSideTray;
public:
struct Params
: public LLInitParam::Block<Params, LLPanel::Params>
{
// image name
Optional<std::string> image;
Optional<std::string> image_selected;
Optional<std::string> tab_title;
Optional<std::string> description;
Params()
: image("image"),
image_selected("image_selected"),
tab_title("tab_title","no title"),
description("description","no description")
{};
};
protected:
LLSideTrayTab(const Params& params);
public:
virtual ~LLSideTrayTab();
/*virtual*/ BOOL postBuild ();
/*virtual*/ bool addChild (LLView* view, S32 tab_group);
void arrange (S32 width, S32 height);
void reshape (S32 width, S32 height, BOOL called_from_parent = TRUE);
static LLSideTrayTab* createInstance ();
const std::string& getDescription () const { return mDescription;}
const std::string& getTabTitle() const { return mTabTitle;}
void draw();
void onOpen (const LLSD& key);
private:
std::string mTabTitle;
std::string mImage;
std::string mImageSelected;
std::string mDescription;
LLView* mMainPanel;
};
LLSideTrayTab::LLSideTrayTab(const Params& p)
: LLPanel(),
mTabTitle(p.tab_title),
mImage(p.image),
mImageSelected(p.image_selected),
mDescription(p.description),
mMainPanel(NULL)
{
// Necessary for focus movement among child controls
setFocusRoot(TRUE);
}
@ -221,6 +281,18 @@ LLSideTrayTab* LLSideTrayTab::createInstance ()
return tab;
}
//////////////////////////////////////////////////////////////////////////////
// LLSideTray
//////////////////////////////////////////////////////////////////////////////
LLSideTray::Params::Params()
: collapsed("collapsed",false),
tab_btn_image_normal("tab_btn_image","sidebar_tab_left.tga"),
tab_btn_image_selected("tab_btn_image_selected","button_enabled_selected_32x128.tga"),
default_button_width("tab_btn_width",32),
default_button_height("tab_btn_height",32),
default_button_margin("tab_btn_margin",0)
{}
//virtual
LLSideTray::LLSideTray(Params& params)
@ -255,35 +327,6 @@ BOOL LLSideTray::postBuild()
setMouseOpaque(false);
return true;
}
/**
* add new panel to tab with tab_name name
* @param tab_name - name of sidebar tab to add new panel
* @param panel - pointer to panel
*/
bool LLSideTray::addPanel ( const std::string& tab_name
,LLPanel* panel )
{
return false;
}
/**
* Add new tab to side bar
* @param tab_name - name of the new tab
* @param image - image for new sidebar button
* @param title - title for new tab
*/
bool LLSideTray::addTab ( const std::string& tab_name
,const std::string& image
,const std::string& title)
{
LLSideTrayTab::Params params;
params.image_path = image;
params.tab_title = title;
LLSideTrayTab* tab = LLUICtrlFactory::create<LLSideTrayTab> (params);
addChild(tab,1);
return true;
}
LLSideTrayTab* LLSideTray::getTab(const std::string& name)
{
@ -291,7 +334,6 @@ LLSideTrayTab* LLSideTray::getTab(const std::string& name)
}
void LLSideTray::toggleTabButton (LLSideTrayTab* tab)
{
if(tab == NULL)
@ -393,25 +435,30 @@ bool LLSideTray::addChild(LLView* view, S32 tab_group)
void LLSideTray::createButtons ()
{
//create show/hide button
mCollapseButton = createButton(EXPANDED_NAME,"",boost::bind(&LLSideTray::onToggleCollapse, this));
//create buttons for tabs
child_vector_const_iter_t child_it = mTabs.begin();
++child_it;
for ( ; child_it != mTabs.end(); ++child_it)
{
LLSideTrayTab* sidebar_tab = dynamic_cast<LLSideTrayTab*>(*child_it);
if(sidebar_tab == NULL)
continue;
string name = sidebar_tab->getName();
std::string name = sidebar_tab->getName();
LLButton* button = createButton("",sidebar_tab->mImagePath,boost::bind(&LLSideTray::onTabButtonClick, this, sidebar_tab->getName()));
mTabButtons[sidebar_tab->getName()] = button;
// The "home" button will open/close the whole panel, this will need to
// change if the home screen becomes its own tab.
if (name == "sidebar_home")
{
mCollapseButton = createButton("",sidebar_tab->mImage,
boost::bind(&LLSideTray::onToggleCollapse, this));
}
else
{
LLButton* button = createButton("",sidebar_tab->mImage,
boost::bind(&LLSideTray::onTabButtonClick, this, name));
mTabButtons[name] = button;
}
}
}
void LLSideTray::onTabButtonClick(string name)
@ -514,25 +561,33 @@ void LLSideTray::arrange ()
}
}
void LLSideTray::collapseSideBar ()
void LLSideTray::collapseSideBar()
{
mCollapsed = true;
mCollapseButton->setLabel(COLLAPSED_NAME);
LLSideTrayTab* home_tab = getTab("sidebar_home");
if (home_tab)
{
mCollapseButton->setImageOverlay( home_tab->mImage );
}
mActiveTab->setVisible(FALSE);
reflectCollapseChange();
setFocus( FALSE );
}
void LLSideTray::expandSideBar ()
void LLSideTray::expandSideBar()
{
mCollapsed = false;
mCollapseButton->setLabel(EXPANDED_NAME);
LLSideTrayTab* home_tab = getTab("sidebar_home");
if (home_tab)
{
mCollapseButton->setImageOverlay( home_tab->mImageSelected );
}
LLSD key;//empty
mActiveTab->onOpen(key);
mActiveTab->setVisible(TRUE);
reflectCollapseChange();
}
void LLSideTray::highlightFocused()

78
indra/newview/llsidetray.h
View File

@ -36,59 +36,9 @@
#include "llpanel.h"
#include "string"
class LLSideTray;
class LLSideTrayTab;
class LLAccordionCtrl;
class LLSideTrayTab: public LLPanel
{
friend class LLUICtrlFactory;
friend class LLSideTray;
public:
struct Params
: public LLInitParam::Block<Params, LLPanel::Params>
{
// image name
Optional<std::string> image_path;
Optional<std::string> tab_title;
Optional<std::string> description;
Params()
: image_path("image"),
tab_title("tab_title","no title"),
description("description","no description")
{};
};
protected:
LLSideTrayTab(const Params& params);
public:
virtual ~LLSideTrayTab();
/*virtual*/ BOOL postBuild ();
/*virtual*/ bool addChild (LLView* view, S32 tab_group);
void arrange (S32 width, S32 height);
void reshape (S32 width, S32 height, BOOL called_from_parent = TRUE);
static LLSideTrayTab* createInstance ();
const std::string& getDescription () const { return mDescription;}
const std::string& getTabTitle() const { return mTabTitle;}
void draw();
void onOpen (const LLSD& key);
private:
std::string mTabTitle;
std::string mImagePath;
std::string mDescription;
LLView* mMainPanel;
};
// added inheritance from LLDestroyClass<LLSideTray> to enable Side Tray perform necessary actions
// while disconnecting viewer in LLAppViewer::disconnectViewer().
// LLDestroyClassList::instance().fireCallbacks() calls destroyClass method. See EXT-245.
@ -112,14 +62,7 @@ public:
Optional<S32> default_button_height;
Optional<S32> default_button_margin;
Params()
: collapsed("collapsed",false),
tab_btn_image_normal("tab_btn_image","sidebar_tab_left.tga"),
tab_btn_image_selected("tab_btn_image_selected","button_enabled_selected_32x128.tga"),
default_button_width("tab_btn_width",32),
default_button_height("tab_btn_height",32),
default_button_margin("tab_btn_margin",0)
{};
Params();
};
static LLSideTray* getInstance ();
@ -146,23 +89,6 @@ public:
*/
bool selectTabByIndex(size_t index);
/**
* add new panel to tab with tab_name name
* @param tab_name - name of sidebar tab to add new panel
* @param panel - pointer to panel
*/
bool addPanel ( const std::string& tab_name
,LLPanel* panel );
/**
* Add new tab to side bar
* @param tab_name - name of the new tab
* @param image - image for new sidebar button
* @param title - title for new tab
*/
bool addTab ( const std::string& tab_name
,const std::string& image
,const std::string& title);
/**
* Activate tab with "panel_name" panel
* if no such tab - return NULL, otherwise a pointer to the panel

1
indra/newview/skins/default/xui/en/panel_side_tray.xml
View File

@ -18,6 +18,7 @@
tab_title="Home"
description="Home."
image="TabIcon_Open_Off"
image_selected="TabIcon_Close_Off"
mouse_opaque="false"
background_visible="true"
>