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
68b956b0
Commit
68b956b0
authored
14 years ago
by
Lynx Linden
Browse files
Options
Downloads
Plain Diff
Automated merge with
ssh://hg.lindenlab.com/q/viewer-release
parents
ca211101
d4232e4a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llfloaterabout.cpp
+11
-11
11 additions, 11 deletions
indra/newview/llfloaterabout.cpp
indra/newview/skins/default/xui/en/strings.xml
+1
-1
1 addition, 1 deletion
indra/newview/skins/default/xui/en/strings.xml
with
12 additions
and
12 deletions
indra/newview/llfloaterabout.cpp
+
11
−
11
View file @
68b956b0
...
@@ -135,10 +135,10 @@ BOOL LLFloaterAbout::postBuild()
...
@@ -135,10 +135,10 @@ BOOL LLFloaterAbout::postBuild()
// Render the LLSD from getInfo() as a format_map_t
// Render the LLSD from getInfo() as a format_map_t
LLStringUtil
::
format_map_t
args
;
LLStringUtil
::
format_map_t
args
;
// For reasons I don't yet understand, [ReleaseNotes] is not part of the
// default substitution strings whereas [APP_NAME] is. But it works to
// allow the "Release Notes" URL label to be localized
// simply copy it into these specific args.
args
[
"ReleaseNotes"
]
=
LLTrans
::
getString
(
"ReleaseNotes"
);
args
[
"ReleaseNotes"
]
=
LLTrans
::
getString
(
"ReleaseNotes"
);
for
(
LLSD
::
map_const_iterator
ii
(
info
.
beginMap
()),
iend
(
info
.
endMap
());
for
(
LLSD
::
map_const_iterator
ii
(
info
.
beginMap
()),
iend
(
info
.
endMap
());
ii
!=
iend
;
++
ii
)
ii
!=
iend
;
++
ii
)
{
{
...
@@ -293,14 +293,14 @@ LLSD LLFloaterAbout::getInfo()
...
@@ -293,14 +293,14 @@ LLSD LLFloaterAbout::getInfo()
static
std
::
string
get_viewer_release_notes_url
()
static
std
::
string
get_viewer_release_notes_url
()
{
{
LLSD
query
;
// return a URL to the release notes for this viewer, such as:
query
[
"channel"
]
=
gSavedSettings
.
getString
(
"VersionChannelName"
);
// http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0
query
[
"version"
]
=
LLVersionInfo
::
getVersion
(
);
std
::
string
url
=
LLTrans
::
getString
(
"RELEASE_NOTES_BASE_URL"
);
if
(
!
LLStringUtil
::
endsWith
(
url
,
"/"
))
std
::
ostringstream
url
;
url
+=
"/"
;
url
<<
LLTrans
::
getString
(
"RELEASE_NOTES_BASE_URL"
)
<<
LLURI
::
mapToQueryString
(
query
)
;
url
+=
gSavedSettings
.
getString
(
"VersionChannelName"
)
+
"/"
;
url
+=
LLVersionInfo
::
getShortVersion
();
return
LLWeb
::
escapeURL
(
url
.
str
()
);
return
LLWeb
::
escapeURL
(
url
);
}
}
class
LLFloaterAboutListener
:
public
LLEventAPI
class
LLFloaterAboutListener
:
public
LLEventAPI
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/strings.xml
+
1
−
1
View file @
68b956b0
...
@@ -136,7 +136,7 @@
...
@@ -136,7 +136,7 @@
<string
name=
"RetrievingData"
>
Retrieving...
</string>
<string
name=
"RetrievingData"
>
Retrieving...
</string>
<string
name=
"ReleaseNotes"
>
Release Notes
</string>
<string
name=
"ReleaseNotes"
>
Release Notes
</string>
<string
name=
"RELEASE_NOTES_BASE_URL"
>
http://secondlife.com/
app/r
elease
n
otes/
</string>
<string
name=
"RELEASE_NOTES_BASE_URL"
>
http://
wiki.
secondlife.com/
wiki/R
elease
_N
otes/
</string>
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string
name=
"LoadingData"
>
Loading...
</string>
<string
name=
"LoadingData"
>
Loading...
</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