894261e4e4
Fix build errors introduced in last merge
2010-05-13 16:30:15 -07:00
8b52454990
merge pull from dessie/viewer-public, picking up SLE code
2010-05-13 15:47:32 -07:00
aebb49520b
EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
...
Change enum naming to use WT_INVALID=255 instead of WT_NONE=255. Added WT_NONE as -1.
2010-05-13 17:24:54 -04:00
25711e6bce
EXT-7350 : Grey box appears when opening up calling cards, only partially populated
...
Fixed incorrect icon name which was causing grey box (i.e. icon not found) error.
2010-05-13 17:07:05 -04:00
d066798daa
automated merge
2010-05-13 16:53:57 -04:00
1d6ebfbb57
EXT-4088 : FIXED : INFRASTRUCTURE : Change LLFolderView::getSelectionList to return a selection
...
Function signature change to return a selection instead of taking one as an argument.
2010-05-13 16:53:29 -04:00
b0c2aebece
EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
...
Changed WT_NONE to 255 from -1, since 255 was formerly the designation for WT_INVALID which is now being used for WT_NONE.
2010-05-13 16:28:21 -04:00
d685ba6b85
EXT-7285 FIX en_xui_change for truncation
2010-05-13 12:37:45 -07:00
14f423a23c
DEV-50013 General "name list" support for display name +/- SLID
...
Added lookups via new name cache system. Added optional short_name
parameter to show only display names in the list (don't need this yet).
Removed top-level global refresh of all name list controls when legacy
name cache receives names -- it was inefficient and we don't need it
anymore. Reviewed with Leyla.
2010-05-13 12:18:10 -07:00
83f9fb1e84
EXT-7246 FIX PT remove old overrides
2010-05-13 11:54:02 -07:00
439a98657a
ND-46735 WIP DE linguistic
2010-05-13 11:09:53 -07:00
5975650a8b
EXT-7104 : WIP : improved processing of buttons to show/hide extend/shrink them. Functionality was not changed.
...
* added vector of buttons that can be shown/hidden extended/shrunk on resizing.
* updated these operation to use iteration over this array.
* cleaned up container initialization.
This allow to extend this vector to add new buttons in bottom tray.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/381/
--HG--
branch : product-engine
2010-05-13 16:49:59 +03:00
bef3172ed9
merge
...
--HG--
branch : product-engine
2010-05-13 15:56:34 +03:00
059a714230
EXT-7045 FIX Group profile not using placeholder art
...
add placeholder art, add code to convert texture name to ID since LLTextureCtrl can't accept textures by name...
Reviwed V.Savchuk at https://codereview.productengine.com/secondlife/r/378
--HG--
branch : product-engine
2010-05-13 15:54:23 +03:00
3040d68c26
EXT-7104 : WIP : bottomtray refactoring for future changes. Functionality was not changed.
...
* updated method related to resize logic to take references to S32 instead of pointer.
* added doxygen comments for these methods.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/381/
--HG--
branch : product-engine
2010-05-13 15:14:30 +03:00
93ccf3f221
Merge from default branch
...
--HG--
branch : product-engine
2010-05-13 14:51:03 +03:00
2ab9fbf019
EXT-7218 FIXED added a delete button for attachment items (panel outfit edit)
...
added a deletable wearable item, predecessor of a clothing item, which is used for attachment items
Reviewed by Neal Orman and Mike Antipov at https://codereview.productengine.com/secondlife/r/377
--HG--
branch : product-engine
2010-05-13 13:25:02 +03:00
1b41e68636
EXT-7243 FIXED assigned a callback to the add_to_outfit_btn (panel outfit edit)
...
Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/380
--HG--
branch : product-engine
2010-05-13 13:12:59 +03:00
b95d1142a0
Merge
2010-05-12 16:46:58 -07:00
c3ccbecfda
DEV-50013 Add "Turning off Display Names" preference
...
reviewed by James
2010-05-12 16:46:26 -07:00
bece97b1e1
DEV-50031 Moved buttons in IM ctrl panel to top, looks cleaner
...
Reviewed with Leyla
2010-05-12 16:33:21 -07:00
6871747f11
DEV-50013 Display names limited to 31 chars (not bytes) in viewer UI
...
Reviewed with Leyla
2010-05-12 16:32:54 -07:00
bee1a09146
DEV-50013 IM window titles use correct name lookup method
2010-05-12 16:32:25 -07:00
ab79144d79
Remove unnecessary include (was for debugging)
2010-05-12 16:31:16 -07:00
6b00537c87
DEV-50013 WIP Added utility to get name and SLID in single string
2010-05-12 16:30:57 -07:00
eea99519d4
added winmm.dll shim for deployment in debug builds
2010-05-12 15:49:49 -07:00
d36cffcb7b
DEV-50013 IM inline text uses display names
...
Reviewed with Leyla
2010-05-12 14:01:22 -07:00
df20016e9e
Add link to help docs to "Thanks for updating your name" dialog
2010-05-12 13:55:16 -07:00
3bc7e63f92
Fix merge problem, crash on close prefs due to SmallAvatarNames
...
Was deleted in trunk in code I refactored extensively.
2010-05-12 13:54:49 -07:00
86f6827bf9
automated merge
2010-05-12 16:46:58 -04:00
ee53b612fb
EXT-7324 : INFRASTRUCTURE: Inventorymodel code cleanup
...
Superficial header file cleanup
Lots of moving functions around and recategorizing in LLInventoryModel.h
Removed some obsolete functions, changed scoping of others
Moved some static functions from LLInventoryModel into llinventoryfunctions.h
2010-05-12 16:46:28 -04:00
fd2d23aa2c
Delete textures/xui files incorrectly added back during last merge
2010-05-12 11:58:27 -07:00
265391fb3f
merge
2010-05-12 19:39:11 +01:00
491d0f1ae4
ND-46735 WIP IT linguistic
2010-05-12 11:27:09 -07:00
dbaaebfe5b
EXT-7319 : FIXED : INFRASTRUCTURE : LLInventoryBridge cleanup
...
Const correctness, logic cleanup, took out subclasses redefining same variable as base class (!!!).
2010-05-12 13:46:21 -04:00
f1c775b7be
EXT-7319 : FIXED : INFRASTRUCTURE : LLInventoryBridge cleanup
...
Superficial header file cleanup
2010-05-12 11:40:38 -04:00
b54e4459df
EXT-7104 : WIP : Reformatted panel_bottomtray.xml with Preview Tool.
...
Functionality was not changed. Not reviewed.
--HG--
branch : product-engine
2010-05-12 18:03:28 +03:00
bc9b15a348
EXT-7203 FIXED Re-enabled inventory search for wearables panel
...
- Insert filter editor and inventory panels into layout_stack
- restored filter functionality for a list view
- added proper switching between flat list view and folder list view
- made a little optimization: got rid of redundant findChild calls because of childSetVisible(..., childGetValue(...));
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/362/
--HG--
branch : product-engine
2010-05-12 17:38:07 +03:00
79332f4e3e
EXT-7104 : WIP : Removed dummy icons between buttons may be hidden to simplify adding new buttons.
...
* removed dummy icons
* encreased width and minimal width of next to the left layout panels to icons' widths.
* removed code processed dummy icons
Reviewed by Vadim.
--HG--
branch : product-engine
2010-05-12 17:15:46 +03:00
0815eb1ce4
EXT-7267 FIXED Corrected retrieving of object name.
...
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/376/
--HG--
branch : product-engine
2010-05-12 17:01:32 +03:00
afb366ad7e
EXT-7206 ADDITIONAL COMMIT Added missing avatar sex icons.
...
--HG--
branch : product-engine
2010-05-12 15:46:26 +03:00
3afa084e22
Merge from default branch
...
--HG--
branch : product-engine
2010-05-12 15:43:56 +03:00
fbaae0a2df
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
...
--HG--
branch : product-engine
2010-05-12 14:10:44 +03:00
367b77eb1b
EXT-6783 FIXED Made notifications that are saved into notification well window be persisted and offer notifications non-persisted.
...
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/368/
--HG--
branch : product-engine
2010-05-12 14:10:26 +03:00
36e84baea4
EXT-7204 FIXED added updating verbs and status (panel edit outfit) on base oufit changes
...
--HG--
branch : product-engine
2010-05-12 13:47:14 +03:00
1cee577ca0
Oops! I fixed these compile errors but didn't commit them.
2010-05-12 11:42:53 +01:00
7059173aa9
merge from PE's viewer-trunk
2010-05-12 10:55:19 +01:00
9ab4d2ca8b
EXT-7120 FIXED Added confirmation about leaving group, ad-hoc and p2p call.
...
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/374/
--HG--
branch : product-engine
2010-05-12 11:11:02 +03:00
489a5eb9e2
Merge
2010-05-11 18:17:43 -07:00
188d0dd874
EXT-7299 FIX FR punctuation
2010-05-11 18:16:48 -07:00
James Cook