f5bada7e3d
merge
...
--HG--
branch : product-engine
2009-11-18 19:03:45 +02:00
30a2cf81e5
implemented normal task EXT-2519 Share button in IM should put 'Drag items from inventory here' in IM window
...
--HG--
branch : product-engine
2009-11-18 18:59:12 +02:00
4dc294e6dc
fixed low bug (EXT-2552) Building of notification toast's panel produces a creation of dummy icon
...
removed commented code from XML file
removed from toast notify panel Icon member and a corresponding code
--HG--
branch : product-engine
2009-11-18 18:36:10 +02:00
1ea7c51f7e
merge
...
--HG--
branch : product-engine
2009-11-18 18:26:14 +02:00
815f336a15
For EXT-2574, EXT-2577: remove from outfit now enforces mandatory body parts, teen underthings
...
--HG--
branch : avatar-pipeline
2009-11-18 11:23:59 -05:00
40041fc2af
Fixed normal priority bug EXT-2606 (Stand/Stop Flying btn disappear if movement floater looses focus).
...
--HG--
branch : product-engine
2009-11-18 18:03:48 +02:00
b3cb61a26a
Fixed major bug EXT-2532-IM timestamp is when message is viewed, not when it was sent and received. Time str from the arriving message used now instead of constructing it dynamicly.
...
--HG--
branch : product-engine
2009-11-18 17:57:47 +02:00
f3e576eda2
merge
...
--HG--
branch : product-engine
2009-11-18 17:27:21 +02:00
0688ae8c51
No ticket. Remove unnecessary including of "llbottomtray.h"
...
--HG--
branch : product-engine
2009-11-18 17:10:51 +02:00
fce52249ab
Particial fix for normal bug EXT-2410- Accepting an Offered Notecard Should Open the Side Bar Inventory Tab. Added select command while opening inventory sidetray panel
...
--HG--
branch : product-engine
2009-11-18 16:04:41 +02:00
2345e40fa5
Fixed minor bug EXT-2545 (TP History: focused item highlight
...
overlaps next item in list).
--HG--
branch : product-engine
2009-11-18 15:54:40 +02:00
a35fbddb91
EXT-2094
2009-11-18 20:52:53 +08:00
753e482b3f
No ticket. Remove unnecessary including of "llchiclet.h" in a header file.
...
--HG--
branch : product-engine
2009-11-18 14:51:09 +02:00
e78db00d14
merge
...
--HG--
branch : product-engine
2009-11-18 14:42:05 +02:00
9fdae4414f
Merge from default branch
...
--HG--
branch : product-engine
2009-11-18 14:40:22 +02:00
764afa899e
Fixed major bug EXT-2608 (Crash: Sometimes LLNavigationBar is trying
...
to access deleted LLSearchHistory singleton when exiting from viewer).
--HG--
branch : product-engine
2009-11-18 14:25:58 +02:00
c22a90669c
Work on normal sub-task EXT-2553 (Change Sys well icon & Counter according to ALTERNATE design)
...
- implemented counter next to the left from an envelope icon.
- button now has fixed width for 3 digits.
--HG--
branch : product-engine
2009-11-18 13:04:17 +02:00
22aa5eed91
merge.
2009-11-18 10:43:30 +00:00
215b95eb64
related to EXT-2515 "Docked floaters should be resizeable"
...
avoid undock floater when resize initiated not by user
--HG--
branch : product-engine
2009-11-18 11:35:11 +02:00
da2a0cfceb
Merge
...
--HG--
branch : product-engine
2009-11-18 10:04:08 +02:00
125b779fb6
merge
2009-11-17 23:39:42 -08:00
2d82332479
Fix for avp->hg incorrect merge.
2009-11-17 21:23:53 -05:00
063dcf7307
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-17 18:21:28 -08:00
78bb530dab
Fix llkdu.dll inclusion problem
...
llkdu.dll was referenced via "configuration", but sharedlibs prefix already included "configuration"
2009-11-17 18:20:33 -08:00
70d73152a6
Revert accidental checkin that disabled protected folder types.
2009-11-17 21:00:37 -05:00
0f94b7ac3d
merge
2009-11-17 20:17:21 -05:00
a34c89df87
EXT-1916 : Landmarks are not sorted in the Favorites Bar accordion
...
Sorting was fixed when LLFolderViewFolder was added back into the inventory panels. This checkin additionally allows sorting in the landmarks inventory panel.
2009-11-17 20:13:31 -05:00
ceee6c3e5e
Header file cleanup.
...
Removed unnecessary headers from llinventorybridge.cpp.
2009-11-17 19:40:43 -05:00
2f4744ae0f
Removed false positive "notification triggered for item..." warning.
2009-11-17 19:37:56 -05:00
acc53aa2f7
merge
2009-11-17 16:10:36 -08:00
521820ad8d
Merge of avatar-pipeline branch into viewer2
2009-11-17 19:08:13 -05:00
15cbc0abd8
EXT-2403 Object name, description now forced to be ASCII characters only
...
Also fixes EXT-172, EXT-2399. Semantics now are:
Object name, object desc, parcel name, region name, inventory item name
all are ASCII only.
Parcel desc allows arbitrary Unicode chars.
Group names force ASCII only.
Reviewed with Leyla
2009-11-17 16:07:48 -08:00
e6caf96b0a
post viewer2 merge compile fix (minor)
...
--HG--
branch : avatar-pipeline
2009-11-17 19:03:30 -05:00
9a30cde27b
EXT-2580 : Regression: Links are no longer PERM_NONE
...
For some reason, we started using the baseobj's permissions instead of the link's permissions at some point. Reverting it back to using the link's permissions.
2009-11-17 18:55:01 -05:00
913eff0f67
merge
2009-11-17 15:15:23 -08:00
8e988f04b7
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-11-17 17:58:58 -05:00
34a267fddf
ext-2557 Buttons should not be bolded. Changed lots of SansSerifBold and SansSerifSmallBold to SansSerif and SansSerifSmall
2009-11-17 17:58:48 -05:00
3217887356
Merge of viewer2 into avp
...
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05:00
d2fe3e8089
merge
2009-11-17 14:37:55 -08:00
889456e892
Server compile fix.
...
Changed FT_CATEGORY -> FT_ROOT_INVENTORY
Removed AT_ROOT_CATEGORY
This parallels llasset cleanup work done on viewer-side for removing the unused AT_ROOT_CATEGORY type, and for making it more clear that a folder of type FT_CATEGORY (now FT_ROOT_INVENTORY) is your "My Inventory" folder.
2009-11-17 17:32:20 -05:00
315276a309
Trivial .xml change to remove no-longer-used xui panel argument ("hide_top_panel").
2009-11-17 17:30:27 -05:00
630bb05641
ext-2473 Zoom has two + buttons and no -
2009-11-17 16:28:04 -05:00
064fb26092
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-11-17 16:22:20 -05:00
8c99b37ac0
EXT-2535 wearables saved in 2.0 don't load in 1.23
...
Incrementing wearable version number was a bad thing here - we want to
keep all wearables reporting as version 22 until we make a breaking change.
Reverted the version number and put in a hack to force any version 24 wearables
to be re-saved as version 22. The hack can be removed before release, as it
should only affect internal testers.
Code reviewed by Seraph
--HG--
branch : avatar-pipeline
2009-11-17 16:22:12 -05:00
17a6848d2f
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
...
--HG--
branch : avatar-pipeline
2009-11-17 16:11:05 -05:00
6474dbd469
For DEV-34652: OUTFITS (Operations) : Wear folders via drag and drop - handle untyped folder dragged to outfit
...
--HG--
branch : avatar-pipeline
2009-11-17 16:07:29 -05:00
49fa0badbb
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-11-17 15:51:34 -05:00
3b3fa1c0ab
Merge from product-engine
2009-11-17 12:37:00 -08:00
6e15f2fd6f
ext-2473 zoom has two + buttons and no -
2009-11-17 15:36:33 -05:00
04c92ee97d
ext-2473 Zoom has two + buttons and no -
2009-11-17 15:34:54 -05:00
Igor Borovkov