Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Black Dragon Viewer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
NiranV
Black Dragon Viewer
Commits
3f96aeff
Commit
3f96aeff
authored
Mar 10, 2020
by
Andrey Kleshchev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SL-12817 New text for snapshot upload
parent
e4a89428
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
4 deletions
+19
-4
indra/newview/llpanelsnapshotinventory.cpp
indra/newview/llpanelsnapshotinventory.cpp
+0
-1
indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
.../skins/default/xui/en/panel_outfit_snapshot_inventory.xml
+4
-2
indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
...newview/skins/default/xui/en/panel_snapshot_inventory.xml
+1
-1
indra/newview/skins/default/xui/en/panel_snapshot_options.xml
...a/newview/skins/default/xui/en/panel_snapshot_options.xml
+14
-0
No files found.
indra/newview/llpanelsnapshotinventory.cpp
View file @
3f96aeff
...
...
@@ -136,7 +136,6 @@ BOOL LLPanelSnapshotInventory::postBuild()
// virtual
void
LLPanelSnapshotInventory
::
onOpen
(
const
LLSD
&
key
)
{
getChild
<
LLUICtrl
>
(
"hint_lbl"
)
->
setTextArg
(
"[UPLOAD_COST]"
,
llformat
(
"%d"
,
LLAgentBenefitsMgr
::
current
().
getTextureUploadCost
()));
LLPanelSnapshot
::
onOpen
(
key
);
}
...
...
indra/newview/skins/default/xui/en/panel_outfit_snapshot_inventory.xml
View file @
3f96aeff
...
...
@@ -41,7 +41,7 @@
<text
follows=
"top|left"
font=
"SansSerif"
height=
"
5
6"
height=
"
12
6"
layout=
"topleft"
left=
"10"
length=
"1"
...
...
@@ -50,7 +50,9 @@
width=
"200"
type=
"string"
word_wrap=
"true"
>
Uploading an image to your inventory costs L$[UPLOAD_COST].
Uploading an image to your inventory costs L$[UPLOAD_COST].
Fee is based on your subscription level. Higher levels are charged lower fees.
</text>
<button
follows=
"right|bottom"
...
...
indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
View file @
3f96aeff
...
...
@@ -118,7 +118,7 @@
width=
"200"
type=
"string"
word_wrap=
"true"
>
Saving an image to your inventory costs L$[UPLOAD_COST].
To save your image as a texture select one of the square formats.
To save your image as a texture select one of the square formats.
</text>
<button
follows=
"right|bottom"
...
...
indra/newview/skins/default/xui/en/panel_snapshot_options.xml
View file @
3f96aeff
...
...
@@ -73,4 +73,18 @@
<button.commit_callback
function=
"Snapshot.SaveToEmail"
/>
</button>
<text
follows=
"top|left"
font=
"SansSerif"
height=
"56"
layout=
"topleft"
left=
"10"
length=
"1"
name=
"fee_hint_lbl"
top_pad=
"7"
width=
"200"
type=
"string"
word_wrap=
"true"
>
Fee is based on your subscription level. Higher levels are charged lower fees.
</text>
</panel>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment