Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
a618a391
Commit
a618a391
authored
15 years ago
by
angela
Browse files
Options
Downloads
Plain Diff
Automated merge with
ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
parents
dc44d2dc
e48f56fe
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/lltoolpie.cpp
+20
-7
20 additions, 7 deletions
indra/newview/lltoolpie.cpp
indra/newview/skins/default/xui/en/strings.xml
+3
-1
3 additions, 1 deletion
indra/newview/skins/default/xui/en/strings.xml
with
23 additions
and
8 deletions
indra/newview/lltoolpie.cpp
+
20
−
7
View file @
a618a391
...
@@ -901,6 +901,16 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
...
@@ -901,6 +901,16 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
||
!
existing_inspector
->
getVisible
()
||
!
existing_inspector
->
getVisible
()
||
existing_inspector
->
getKey
()[
"object_id"
].
asUUID
()
!=
hover_object
->
getID
()))
||
existing_inspector
->
getKey
()[
"object_id"
].
asUUID
()
!=
hover_object
->
getID
()))
{
{
// Add price to tooltip for items on sale
bool
for_sale
=
for_sale_selection
(
nodep
);
if
(
for_sale
)
{
LLStringUtil
::
format_map_t
args
;
args
[
"[PRICE]"
]
=
llformat
(
"%d"
,
nodep
->
mSaleInfo
.
getSalePrice
());
tooltip_msg
.
append
(
LLTrans
::
getString
(
"TooltipPrice"
,
args
)
);
}
if
(
nodep
->
mName
.
empty
())
if
(
nodep
->
mName
.
empty
())
{
{
tooltip_msg
.
append
(
LLTrans
::
getString
(
"TooltipNoName"
));
tooltip_msg
.
append
(
LLTrans
::
getString
(
"TooltipNoName"
));
...
@@ -931,7 +941,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
...
@@ -931,7 +941,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
if
(
media_impl
.
notNull
()
&&
(
media_impl
->
hasMedia
()))
if
(
media_impl
.
notNull
()
&&
(
media_impl
->
hasMedia
()))
{
{
is_media_displaying
=
true
;
is_media_displaying
=
true
;
LLStringUtil
::
format_map_t
args
;
//
LLStringUtil::format_map_t args;
media_plugin
=
media_impl
->
getMediaPlugin
();
media_plugin
=
media_impl
->
getMediaPlugin
();
if
(
media_plugin
)
if
(
media_plugin
)
...
@@ -955,10 +965,13 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
...
@@ -955,10 +965,13 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
}
}
}
}
// Avoid showing tip over media that's displaying
// Avoid showing tip over media that's displaying unless it's for sale
// also check the primary node since sometimes it can have an action even though
// also check the primary node since sometimes it can have an action even though
// the root node doesn't
// the root node doesn't
bool
needs_tip
=
!
is_media_displaying
&&
bool
needs_tip
=
(
!
is_media_displaying
||
for_sale
)
&&
(
has_media
||
(
has_media
||
needs_tooltip
(
nodep
)
||
needs_tooltip
(
nodep
)
||
needs_tooltip
(
LLSelectMgr
::
getInstance
()
->
getPrimaryHoverNode
()));
needs_tooltip
(
LLSelectMgr
::
getInstance
()
->
getPrimaryHoverNode
()));
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/strings.xml
+
3
−
1
View file @
a618a391
...
@@ -77,6 +77,8 @@
...
@@ -77,6 +77,8 @@
<string
name=
"TooltipMapUrl"
>
Click to view this location on a map
</string>
<string
name=
"TooltipMapUrl"
>
Click to view this location on a map
</string>
<string
name=
"TooltipSLAPP"
>
Click to run the secondlife:// command
</string>
<string
name=
"TooltipSLAPP"
>
Click to run the secondlife:// command
</string>
<string
name=
"CurrentURL"
value=
" CurrentURL: [CurrentURL]"
/>
<string
name=
"CurrentURL"
value=
" CurrentURL: [CurrentURL]"
/>
<string
name=
"TooltipPrice"
value=
" L$[PRICE]-"
/>
<!-- text for SLURL labels -->
<!-- text for SLURL labels -->
<string
name=
"SLurlLabelTeleport"
>
Teleport to
</string>
<string
name=
"SLurlLabelTeleport"
>
Teleport to
</string>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment