Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
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
Alchemy Viewer
Alchemy Viewer
Commits
22a931ef
Commit
22a931ef
authored
11 years ago
by
Jonathan Yap
Browse files
Options
Downloads
Patches
Plain Diff
STORM-1957 World Map - Land For Sale is missing L$ / sqm
parent
6060e5e4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/newview/llworldmap.cpp
+11
-0
11 additions, 0 deletions
indra/newview/llworldmap.cpp
indra/newview/skins/default/xui/en/strings.xml
+1
-1
1 addition, 1 deletion
indra/newview/skins/default/xui/en/strings.xml
with
13 additions
and
1 deletion
doc/contributions.txt
+
1
−
0
View file @
22a931ef
...
@@ -649,6 +649,7 @@ Jonathan Yap
...
@@ -649,6 +649,7 @@ Jonathan Yap
STORM-1858
STORM-1858
STORM-1862
STORM-1862
OPEN-161
OPEN-161
STORM-1957
Kadah Coba
Kadah Coba
STORM-1060
STORM-1060
STORM-1843
STORM-1843
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llworldmap.cpp
+
11
−
0
View file @
22a931ef
...
@@ -522,6 +522,17 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
...
@@ -522,6 +522,17 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
tooltip_fmt
.
setArg
(
"[AREA]"
,
llformat
(
"%d"
,
extra
));
tooltip_fmt
.
setArg
(
"[AREA]"
,
llformat
(
"%d"
,
extra
));
tooltip_fmt
.
setArg
(
"[PRICE]"
,
llformat
(
"%d"
,
extra2
));
tooltip_fmt
.
setArg
(
"[PRICE]"
,
llformat
(
"%d"
,
extra2
));
// Check for division by zero
if
(
extra
!=
0
)
{
tooltip_fmt
.
setArg
(
"[SQMPRICE]"
,
llformat
(
"%.1f"
,
(
F32
)
extra2
/
(
F32
)
extra
));
}
else
{
tooltip_fmt
.
setArg
(
"[SQMPRICE]"
,
LLTrans
::
getString
(
"Unknown"
));
}
new_item
.
setTooltip
(
tooltip_fmt
.
getString
());
new_item
.
setTooltip
(
tooltip_fmt
.
getString
());
if
(
type
==
MAP_ITEM_LAND_FOR_SALE
)
if
(
type
==
MAP_ITEM_LAND_FOR_SALE
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/strings.xml
+
1
−
1
View file @
22a931ef
...
@@ -378,7 +378,7 @@ Please try logging in again in a minute.</string>
...
@@ -378,7 +378,7 @@ Please try logging in again in a minute.</string>
<!-- world map -->
<!-- world map -->
<string
name=
"texture_loading"
>
Loading...
</string>
<string
name=
"texture_loading"
>
Loading...
</string>
<string
name=
"worldmap_offline"
>
Offline
</string>
<string
name=
"worldmap_offline"
>
Offline
</string>
<string
name=
"worldmap_item_tooltip_format"
>
[AREA] m² L$[PRICE]
</string>
<string
name=
"worldmap_item_tooltip_format"
>
[AREA] m² L$[PRICE]
([SQMPRICE] L$/m²)
</string>
<string
name=
"worldmap_results_none_found"
>
None found.
</string>
<string
name=
"worldmap_results_none_found"
>
None found.
</string>
<!-- animations uploading status codes -->
<!-- animations uploading status codes -->
...
...
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