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

Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.

meow-7.2.2
Todd Stinson 2012-06-11 18:05:06 -07:00
parent b5694ee3aa e05d70174c
commit ed99d0a079
8 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/lllocationinputctrl.cpp
View File

@ -191,7 +191,8 @@ LLLocationInputCtrl::Params::Params()
damage_icon("damage_icon"),
damage_text("damage_text"),
see_avatars_icon("see_avatars_icon"),
maturity_help_topic("maturity_help_topic")
maturity_help_topic("maturity_help_topic"),
pathfinding_dynamic_icon("pathfinding_dynamic_icon")
{
}
@ -270,7 +271,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
if (p.icon_maturity_general())
{
mIconMaturityGeneral = p.icon_maturity_general;
}
}
if (p.icon_maturity_adult())
{
mIconMaturityAdult = p.icon_maturity_adult;
@ -279,7 +280,7 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
{
mIconMaturityModerate = p.icon_maturity_moderate;
}
LLButton::Params maturity_button = p.maturity_button;
mMaturityButton = LLUICtrlFactory::create<LLButton>(maturity_button);
addChild(mMaturityButton);
@ -336,7 +337,13 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
mParcelIcon[DAMAGE_ICON] = LLUICtrlFactory::create<LLIconCtrl>(damage_icon);
mParcelIcon[DAMAGE_ICON]->setMouseDownCallback(boost::bind(&LLLocationInputCtrl::onParcelIconClick, this, DAMAGE_ICON));
addChild(mParcelIcon[DAMAGE_ICON]);
LLIconCtrl::Params pathfinding_dynamic_icon = p.pathfinding_dynamic_icon;
pathfinding_dynamic_icon.tool_tip = LLTrans::getString("PathfindingDynamicTooltip");
pathfinding_dynamic_icon.mouse_opaque = true;
mParcelIcon[PATHFINDING_DYNAMIC] = LLUICtrlFactory::create<LLIconCtrl>(pathfinding_dynamic_icon);
addChild(mParcelIcon[PATHFINDING_DYNAMIC]);
LLTextBox::Params damage_text = p.damage_text;
damage_text.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip");
damage_text.mouse_opaque = true;
@ -819,6 +826,7 @@ void LLLocationInputCtrl::refreshParcelIcons()
bool allow_scripts = vpm->allowAgentScripts(agent_region, current_parcel);
bool allow_damage = vpm->allowAgentDamage(agent_region, current_parcel);
bool see_avs = current_parcel->getSeeAVs();
bool pathfinding_dynamic = true;// gAgent.getRegion()->dynamicPathfindingEnabled();
// Most icons are "block this ability"
mParcelIcon[VOICE_ICON]->setVisible( !allow_voice );
@ -827,6 +835,9 @@ void LLLocationInputCtrl::refreshParcelIcons()
mParcelIcon[BUILD_ICON]->setVisible( !allow_build );
mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts );
mParcelIcon[DAMAGE_ICON]->setVisible( allow_damage );
//prep#
mParcelIcon[PATHFINDING_DYNAMIC]->setVisible( pathfinding_dynamic );
mDamageText->setVisible(allow_damage);
mParcelIcon[SEE_AVATARS_ICON]->setVisible( !see_avs );
@ -1188,6 +1199,9 @@ void LLLocationInputCtrl::onParcelIconClick(EParcelIcon icon)
case SEE_AVATARS_ICON:
LLNotificationsUtil::add("SeeAvatars");
break;
case PATHFINDING_DYNAMIC:
// prep TODO : add something here
break;
case ICON_COUNT:
break;
// no default to get compiler warning when a new icon gets added

7
indra/newview/lllocationinputctrl.h
View File

@ -78,7 +78,8 @@ public:
build_icon,
scripts_icon,
damage_icon,
see_avatars_icon;
see_avatars_icon,
pathfinding_dynamic_icon;
Optional<LLTextBox::Params> damage_text;
Params();
};
@ -116,7 +117,8 @@ private:
SCRIPTS_ICON, // 4
DAMAGE_ICON, // 5
SEE_AVATARS_ICON, // 6
ICON_COUNT // 7 total
PATHFINDING_DYNAMIC,// 7
ICON_COUNT // 8 total
};
friend class LLUICtrlFactory;
@ -184,6 +186,7 @@ private:
LLPointer<LLUIImage> mIconMaturityGeneral;
LLPointer<LLUIImage> mIconMaturityAdult;
LLPointer<LLUIImage> mIconMaturityModerate;
LLPointer<LLUIImage> mIconPathfindingDynamic;
std::string mAddLandmarkTooltip;
std::string mEditLandmarkTooltip;

6
indra/newview/llviewerregion.cpp
View File

@ -1151,6 +1151,7 @@ void LLViewerRegion::getInfo(LLSD& info)
void LLViewerRegion::getSimulatorFeatures(LLSD& sim_features)
{
sim_features = mSimulatorFeatures;
}
void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
@ -1836,4 +1837,9 @@ bool LLViewerRegion::meshRezEnabled() const
mSimulatorFeatures["MeshRezEnabled"].asBoolean());
}
bool LLViewerRegion::dynamicPathfindingEnabled() const
{
return ( mSimulatorFeatures.has("DynamicPathfindingEnabled") &&
mSimulatorFeatures["DynamicPathfindingEnabled"].asBoolean());
}

3
indra/newview/llviewerregion.h
View File

@ -285,6 +285,9 @@ public:
void getSimulatorFeatures(LLSD& info);
void setSimulatorFeatures(const LLSD& info);
bool dynamicPathfindingEnabled() const;
typedef enum
{
CACHE_MISS_TYPE_FULL = 0,

BIN
indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 683 B

2
indra/newview/skins/default/textures/textures.xml
View File

@ -432,6 +432,8 @@ with the same filename but different name
<texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" />
<texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" />
<texture name="Pathfinding_Dynamic" file_name="icons/Pathfinding_Dynamic.png" preload="false" />
<texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" />
<texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
<texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />

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

@ -3325,7 +3325,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
<string name="LocationCtrlGeneralIconTooltip">General Region</string>
<string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
<string name="PathfindingDynamicTooltip">Dynamic Pathfinding Enabled</string>
<!-- Strings used by the (currently Linux) auto-updater app -->
<string name="UpdaterWindowTitle">
[APP_NAME] Update

9
indra/newview/skins/default/xui/en/widgets/location_input.xml
View File

@ -112,6 +112,15 @@
follows="right|top"
image_name="Parcel_Health_Dark"
/>
<pathfinding_dynamic_icon
name="pathfinding_dynamic_icon"
width="14"
height="13"
top="19"
left="2"
follows="right|top"
image_name="Pathfinding_Dynamic"
/>
<!-- Default text color is invisible on top of nav bar background -->
<damage_text
name="damage_text"