Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Alchemy Viewer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
62
Issues
62
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
Environments
Packages & Registries
Packages & Registries
Package Registry
Container 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
Alchemy
Alchemy Viewer
Commits
8f80020e
Commit
8f80020e
authored
Dec 23, 2014
by
Cinder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ALCH-161 - Make the Object Contents floater not disgusting
parent
234ccc50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
81 deletions
+31
-81
indra/newview/llfloateropenobject.cpp
indra/newview/llfloateropenobject.cpp
+9
-17
indra/newview/llfloateropenobject.h
indra/newview/llfloateropenobject.h
+1
-3
indra/newview/skins/default/xui/en/floater_openobject.xml
indra/newview/skins/default/xui/en/floater_openobject.xml
+21
-61
No files found.
indra/newview/llfloateropenobject.cpp
View file @
8f80020e
...
...
@@ -56,9 +56,6 @@ LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)
mPanelInventoryObject
(
NULL
),
mDirty
(
TRUE
)
{
mCommitCallbackRegistrar
.
add
(
"OpenObject.MoveToInventory"
,
boost
::
bind
(
&
LLFloaterOpenObject
::
onClickMoveToInventory
,
this
));
mCommitCallbackRegistrar
.
add
(
"OpenObject.MoveAndWear"
,
boost
::
bind
(
&
LLFloaterOpenObject
::
onClickMoveAndWear
,
this
));
mCommitCallbackRegistrar
.
add
(
"OpenObject.ReplaceOutfit"
,
boost
::
bind
(
&
LLFloaterOpenObject
::
onClickReplace
,
this
));
mCommitCallbackRegistrar
.
add
(
"OpenObject.Cancel"
,
boost
::
bind
(
&
LLFloaterOpenObject
::
onClickCancel
,
this
));
}
...
...
@@ -72,6 +69,7 @@ BOOL LLFloaterOpenObject::postBuild()
{
getChild
<
LLUICtrl
>
(
"object_name"
)
->
setTextArg
(
"[DESC]"
,
std
::
string
(
"Object"
)
);
// *Note: probably do not want to translate this
mPanelInventoryObject
=
getChild
<
LLPanelObjectInventory
>
(
"object_contents"
);
getChild
<
LLUICtrl
>
(
"copy_flyout"
)
->
setCommitCallback
(
boost
::
bind
(
&
LLFloaterOpenObject
::
onClickCopy
,
this
,
_1
));
refresh
();
return
TRUE
;
...
...
@@ -238,21 +236,15 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
delete
cat
;
}
void
LLFloaterOpenObject
::
onClick
MoveToInventory
(
)
void
LLFloaterOpenObject
::
onClick
Copy
(
LLUICtrl
*
ctrl
)
{
moveToInventory
(
false
);
closeFloater
();
}
void
LLFloaterOpenObject
::
onClickMoveAndWear
()
{
moveToInventory
(
true
,
false
);
closeFloater
();
}
void
LLFloaterOpenObject
::
onClickReplace
()
{
moveToInventory
(
true
,
true
);
const
std
::
string
&
action
=
ctrl
->
getValue
().
asString
();
if
(
action
==
"replace"
)
moveToInventory
(
true
,
true
);
else
if
(
action
==
"add"
)
moveToInventory
(
true
,
false
);
else
moveToInventory
(
false
);
closeFloater
();
}
...
...
indra/newview/llfloateropenobject.h
View file @
8f80020e
...
...
@@ -62,9 +62,7 @@ protected:
void
moveToInventory
(
bool
wear
,
bool
replace
=
false
);
void
onClickMoveToInventory
();
void
onClickMoveAndWear
();
void
onClickReplace
();
void
onClickCopy
(
LLUICtrl
*
ctrl
);
void
onClickCancel
();
static
void
callbackCreateInventoryCategory
(
const
LLUUID
&
category_id
,
LLUUID
object_id
,
bool
wear
,
bool
replace
=
false
);
static
void
callbackMoveInventory
(
S32
result
,
void
*
data
);
...
...
indra/newview/skins/default/xui/en/floater_openobject.xml
View file @
8f80020e
...
...
@@ -3,9 +3,9 @@
legacy_header_height=
"18"
can_resize=
"true"
default_tab_group=
"1"
height=
"3
70
"
height=
"3
22
"
layout=
"topleft"
min_height=
"1
9
0"
min_height=
"1
6
0"
min_width=
"285"
name=
"objectcontents"
help_topic=
"objectcontents"
...
...
@@ -31,80 +31,40 @@
background_visible=
"false"
draw_border=
"false"
follows=
"all"
height=
"2
4
0"
height=
"2
5
0"
layout=
"topleft"
left=
"10"
name=
"object_contents"
top_pad=
"0"
width=
"284"
/>
<view_border
bevel_style=
"none"
follows=
"
bottom|left
"
height=
"
50
"
highlight_light_color=
"0.6 0.6 0.6
"
<flyout_button
follows=
"
left|right|bottom
"
height=
"
23
"
label=
"Copy To Inventory
"
layout=
"topleft"
left=
"10"
name=
"
border
"
name=
"
copy_flyout
"
top_pad=
"5"
width=
"270"
/>
<text
follows=
"bottom|left"
height=
"15"
layout=
"topleft"
left=
"15"
name=
"border_note"
text_color=
"White"
top_delta=
"5"
>
Copy to inventory and wear
</text>
<button
follows=
"bottom|left"
height=
"23"
label=
"Add to outfit"
label_selected=
"Add to outfit"
layout=
"topleft"
left=
"15"
name=
"copy_and_wear_button"
top_pad=
"3"
width=
"135"
>
<button.commit_callback
function=
"OpenObject.MoveAndWear"
/>
</button>
<button
follows=
"bottom|left"
height=
"23"
label=
"Replace outfit"
label_selected=
"Replace outfit"
layout=
"topleft"
left_pad=
"5"
name=
"copy_and_replace_button"
width=
"120"
>
<button.commit_callback
function=
"OpenObject.ReplaceOutfit"
/>
</button>
<button
follows=
"bottom|left"
height=
"23"
label=
"Only copy to inventory"
label_selected=
"Only copy to inventory"
layout=
"topleft"
left=
"15"
name=
"copy_to_inventory_button"
tab_group=
"1"
top_pad=
"9"
width=
"135"
>
<button.commit_callback
function=
"OpenObject.MoveToInventory"
/>
</button>
width=
"153"
>
<flyout_button.item
label=
"Replace outfit with contents"
name=
"replace"
value=
"replace"
/>
<flyout_button.item
label=
"Add contents to outfit"
name=
"add"
value=
"add"
/>
</flyout_button>
<button
follows=
"bottom|
lef
t"
follows=
"bottom|
righ
t"
height=
"23"
label=
"Cancel"
label_selected=
"Cancel"
layout=
"topleft"
left_pad=
"5"
name=
"cancel_button"
width=
"12
0
"
>
width=
"12
5
"
>
<button.commit_callback
function=
"OpenObject.Cancel"
/>
</button>
...
...
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