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
f1c8674a
Commit
f1c8674a
authored
13 years ago
by
Oz Linden
Browse files
Options
Downloads
Plain Diff
merge changes for storm-1809
parents
57fe6f66
93c570b3
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/newview/lltexturectrl.cpp
+7
-0
7 additions, 0 deletions
indra/newview/lltexturectrl.cpp
indra/newview/skins/default/xui/en/strings.xml
+3
-0
3 additions, 0 deletions
indra/newview/skins/default/xui/en/strings.xml
with
11 additions
and
0 deletions
doc/contributions.txt
+
1
−
0
View file @
f1c8674a
...
...
@@ -618,6 +618,7 @@ Jonathan Yap
STORM-1803
STORM-1799
STORM-1796
STORM-1809
STORM-1793
STORM-1810
Kadah Coba
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lltexturectrl.cpp
+
7
−
0
View file @
f1c8674a
...
...
@@ -929,6 +929,13 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
tentative_label_p
.
rect
(
LLRect
(
0
,
image_middle
+
line_height
/
2
,
getRect
().
getWidth
(),
image_middle
-
line_height
/
2
));
tentative_label_p
.
follows
.
flags
(
FOLLOWS_ALL
);
mTentativeLabel
=
LLUICtrlFactory
::
create
<
LLTextBox
>
(
tentative_label_p
);
// It is no longer possible to associate a style with a textbox, so it has to be done in this fashion
LLStyle
::
Params
style_params
;
style_params
.
color
=
LLColor4
::
white
;
mTentativeLabel
->
setText
(
LLTrans
::
getString
(
"multiple_textures"
),
style_params
);
mTentativeLabel
->
setHAlign
(
LLFontGL
::
HCENTER
);
addChild
(
mTentativeLabel
);
LLRect
border_rect
=
getLocalRect
();
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/strings.xml
+
3
−
0
View file @
f1c8674a
...
...
@@ -369,6 +369,9 @@ Please try logging in again in a minute.</string>
<string
name=
"anim_yes_happy"
>
Yes (Happy)
</string>
<string
name=
"anim_yes_head"
>
Yes
</string>
<!-- build floater -->
<string
name=
"multiple_textures"
>
Multiple
</string>
<!-- world map -->
<string
name=
"texture_loading"
>
Loading...
</string>
<string
name=
"worldmap_offline"
>
Offline
</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