summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/llcharacter/llvisualparam.cpp6
-rw-r--r--indra/llcharacter/llvisualparam.h1
-rw-r--r--indra/llui/llfloater.cpp14
-rw-r--r--indra/newview/lldriverparam.cpp25
-rw-r--r--indra/newview/lldriverparam.h1
-rw-r--r--indra/newview/llvoavatar.cpp6
-rw-r--r--indra/newview/llwearable.cpp3
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml75
8 files changed, 60 insertions, 71 deletions
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp
index e948913a68..c4763c6331 100644
--- a/indra/llcharacter/llvisualparam.cpp
+++ b/indra/llcharacter/llvisualparam.cpp
@@ -311,3 +311,9 @@ BOOL LLVisualParam::linkDrivenParams(visual_param_mapper mapper, bool only_cross
return TRUE;
}
+//virtual
+void LLVisualParam::resetDrivenParams()
+{
+ // nothing to do for non-driver parameters
+ return;
+}
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
index b2b697766f..e6503d611d 100644
--- a/indra/llcharacter/llvisualparam.h
+++ b/indra/llcharacter/llvisualparam.h
@@ -120,6 +120,7 @@ public:
virtual void stopAnimating(BOOL set_by_user);
virtual BOOL linkDrivenParams(visual_param_mapper mapper, bool only_cross_params);
+ virtual void resetDrivenParams();
// Interface methods
S32 getID() const { return mID; }
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 3b9ab3ddda..cad1fd1a33 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1439,18 +1439,12 @@ void LLFloater::onClickHelp( LLFloater* self )
{
if (self && LLUI::sHelpImpl)
{
- // get the help topic for this floater
- std::string help_topic = self->getHelpTopic();
-
- // but use a more specific help topic for the currently
- // displayed tab inside of this floater, if present
- LLPanel *curtab = self->childGetVisibleTabWithHelp();
- if (curtab)
+ // find the current help context for this floater
+ std::string help_topic;
+ if (self->findHelpTopic(help_topic))
{
- help_topic = curtab->getHelpTopic();
+ LLUI::sHelpImpl->showTopic(help_topic);
}
-
- LLUI::sHelpImpl->showTopic(help_topic);
}
}
diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp
index 87a8557a88..e7295512c1 100644
--- a/indra/newview/lldriverparam.cpp
+++ b/indra/newview/lldriverparam.cpp
@@ -180,23 +180,6 @@ BOOL LLDriverParam::setInfo(LLDriverParamInfo *info)
setWeight(getDefaultWeight(), FALSE );
- BOOL success;
- if (mWearablep)
- {
- LLVisualParam*(LLWearable::*function)(S32)const = &LLWearable::getVisualParam; // need this line to disambiguate between versions of LLCharacter::getVisualParam()
- success = linkDrivenParams(boost::bind(function,(LLWearable*)mWearablep, _1), false);
- }
- else
- {
- LLVisualParam*(LLCharacter::*function)(S32)const = &LLCharacter::getVisualParam; // need this line to disambiguate between versions of LLCharacter::getVisualParam()
- success = linkDrivenParams(boost::bind(function,(LLCharacter*)mAvatarp, _1), false);
- }
- if(!success)
- {
- mInfo = NULL;
- return FALSE;
- }
-
return TRUE;
}
@@ -502,8 +485,6 @@ BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, bool only_cross
{
BOOL success = TRUE;
LLDriverParamInfo::entry_info_list_t::iterator iter;
- mDriven.clear();
- mDriven.reserve(getInfo()->mDrivenInfoList.size());
for (iter = getInfo()->mDrivenInfoList.begin(); iter != getInfo()->mDrivenInfoList.end(); ++iter)
{
LLDrivenEntryInfo *driven_info = &(*iter);
@@ -537,6 +518,12 @@ BOOL LLDriverParam::linkDrivenParams(visual_param_mapper mapper, bool only_cross
return success;
}
+void LLDriverParam::resetDrivenParams()
+{
+ mDriven.clear();
+ mDriven.reserve(getInfo()->mDrivenInfoList.size());
+}
+
//-----------------------------------------------------------------------------
// getDrivenWeight()
//-----------------------------------------------------------------------------
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h
index c5dce62fa6..c73e740574 100644
--- a/indra/newview/lldriverparam.h
+++ b/indra/newview/lldriverparam.h
@@ -103,6 +103,7 @@ public:
/*virtual*/ void setAnimationTarget( F32 target_value, BOOL set_by_user );
/*virtual*/ void stopAnimating(BOOL set_by_user);
/*virtual*/ BOOL linkDrivenParams(visual_param_mapper mapper, bool only_cross_params);
+ /*virtual*/ void resetDrivenParams();
// LLViewerVisualParam Virtual functions
/*virtual*/ F32 getTotalDistortion();
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ae62b8d6ec..76e00db91c 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4762,6 +4762,12 @@ BOOL LLVOAvatar::loadAvatar()
if (driver_param->setInfo(info))
{
addVisualParam( driver_param );
+ LLVisualParam*(LLVOAvatar::*avatar_function)(S32)const = &LLVOAvatar::getVisualParam;
+ if( !driver_param->linkDrivenParams(boost::bind(avatar_function,(LLVOAvatar*)this,_1 ), false))
+ {
+ llwarns << "could not link driven params for avatar " << this->getFullname() << " id: " << driver_param->getID() << llendl;
+ continue;
+ }
}
else
{
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp
index 1675ee1adc..09e8c522b0 100644
--- a/indra/newview/llwearable.cpp
+++ b/indra/newview/llwearable.cpp
@@ -194,11 +194,12 @@ void LLWearable::createVisualParams()
LLVisualParam*(LLWearable::*wearable_function)(S32)const = &LLWearable::getVisualParam;
// need this line to disambiguate between versions of LLCharacter::getVisualParam()
LLVisualParam*(LLVOAvatarSelf::*avatar_function)(S32)const = &LLVOAvatarSelf::getVisualParam;
+ param->resetDrivenParams();
if(!param->linkDrivenParams(boost::bind(wearable_function,(LLWearable*)this, _1), false))
{
if( !param->linkDrivenParams(boost::bind(avatar_function,(LLVOAvatarSelf*)avatar,_1 ), true))
{
- llwarns << "could not link driven params for wearable " << getName() << llendl;
+ llwarns << "could not link driven params for wearable " << getName() << " id: " << param->getID() << llendl;
continue;
}
}
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 98dd2ddd79..5979bfab4f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -19,7 +19,7 @@
parameter="preferences" />
</menu_item_call>
<menu_item_call
- label="Manage My Account"
+ label="My Dashboard"
layout="topleft"
name="Manage My Account">
<menu_item_call.on_click
@@ -272,6 +272,28 @@
name="Land"
tear_off="true">
<menu_item_check
+ label="Ban Lines"
+ layout="topleft"
+ name="Ban Lines">
+ <menu_item_check.on_check
+ control="ShowBanLines" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="ShowBanLines" />
+ </menu_item_check>
+ <menu_item_check
+ label="Beacons"
+ layout="topleft"
+ name="beacons"
+ shortcut="control|alt|shift|N">
+ <menu_item_check.on_check
+ function="Floater.Visible"
+ parameter="beacons" />
+ <menu_item_check.on_click
+ function="Floater.Toggle"
+ parameter="beacons" />
+ </menu_item_check>
+ <menu_item_check
label="Property Lines"
layout="topleft"
name="Property Lines"
@@ -292,16 +314,6 @@
function="ToggleControl"
parameter="ShowParcelOwners" />
</menu_item_check>
- <menu_item_check
- label="Ban Lines"
- layout="topleft"
- name="Ban Lines">
- <menu_item_check.on_check
- control="ShowBanLines" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="ShowBanLines" />
- </menu_item_check>
</menu>
<menu_item_separator
layout="topleft" />
@@ -951,36 +963,6 @@
function="Tools.EnableToolNotPie" />
</menu_item_call>
</menu>
- <menu
- create_jump_keys="true"
- label="Beacons"
- layout="topleft"
- name="Beacons"
- tear_off="true">
- <menu_item_check
- label="Beacons"
- layout="topleft"
- name="beacons"
- shortcut="control|alt|shift|N">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="beacons" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="beacons" />
- </menu_item_check>
- <menu_item_check
- label="Cheesy Beacon"
- layout="topleft"
- name="Cheesy Beacon">
- <menu_item_check.on_check
- function="CheckControl"
- parameter="CheesyBeacon" />
- <menu_item_check.on_click
- function="ToggleControl"
- parameter="CheesyBeacon" />
- </menu_item_check>
- </menu>
</menu>
<menu
create_jump_keys="true"
@@ -1229,6 +1211,17 @@
layout="topleft"
name="Highlighting and Visibility"
tear_off="true">
+ <menu_item_check
+ label="Cheesy Beacon"
+ layout="topleft"
+ name="Cheesy Beacon">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="CheesyBeacon" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="CheesyBeacon" />
+ </menu_item_check>
<menu_item_check
label="Hide Particles"
layout="topleft"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 14:03:52 +0000