Dmitry Oleshko
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
Mike Antipov
1ea7c51f7e
merge
...
--HG--
branch : product-engine
2009-11-18 18:26:14 +02:00
Eugene Kondrashev
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
Mike Antipov
f3e576eda2
merge
...
--HG--
branch : product-engine
2009-11-18 17:27:21 +02:00
Mike Antipov
0688ae8c51
No ticket. Remove unnecessary including of "llbottomtray.h"
...
--HG--
branch : product-engine
2009-11-18 17:10:51 +02:00
Eugene Kondrashev
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
Andrew Dyukov
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
Mike Antipov
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
Vadim Savchuk
e78db00d14
merge
...
--HG--
branch : product-engine
2009-11-18 14:42:05 +02:00
Vadim Savchuk
9fdae4414f
Merge from default branch
...
--HG--
branch : product-engine
2009-11-18 14:40:22 +02:00
Andrew Dyukov
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
Mike Antipov
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
Alexei Arabadji
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
Steve Bennetts
125b779fb6
merge
2009-11-17 23:39:42 -08:00
CG Linden
063dcf7307
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-17 18:21:28 -08:00
CG Linden
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
Eric M. Tulla (BigPapi)
521820ad8d
Merge of avatar-pipeline branch into viewer2
2009-11-17 19:08:13 -05:00
Eric M. Tulla (BigPapi)
e6caf96b0a
post viewer2 merge compile fix (minor)
...
--HG--
branch : avatar-pipeline
2009-11-17 19:03:30 -05:00
Steve Bennetts
913eff0f67
merge
2009-11-17 15:15:23 -08:00
Eric M. Tulla (BigPapi)
3217887356
Merge of viewer2 into avp
...
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05:00
Loren Shih
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
Loren Shih
315276a309
Trivial .xml change to remove no-longer-used xui panel argument ("hide_top_panel").
2009-11-17 17:30:27 -05:00
Nyx (Neal Orman)
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
Nyx (Neal Orman)
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
Brad Payne (Vir Linden)
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
Brad Payne (Vir Linden)
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
Steve Bennetts
3b3fa1c0ab
Merge from product-engine
2009-11-17 12:37:00 -08:00
Andrew Dyukov
c76ab6c4b7
Fixed normal bug EXT-2108 (Home panel isn't resized).
...
--HG--
branch : product-engine
2009-11-17 22:17:34 +02:00
Andrew Polunin
a4cc162ca8
- fixed normal bug EXT-2401 Corrupted Place Profile panel is opened after canceling of Pick creation from teleport history panel
...
- fixed normal bug EXT-2470 Corrupted Place Profile panel is opened after canceling of Pick creation from My Landmarks tab
(NOTE: the same code fixes both)
--HG--
branch : product-engine
2009-11-17 21:26:12 +02:00
Ramzi Linden
2365dbcd45
merge
2009-11-18 03:15:30 +08:00
Ramzi Linden
d6bbc652de
L10N: fix a typo in a localized label
2009-11-18 02:53:44 +08:00
Eugene Mutavchi
5d446cdf52
Fixed low bug EXT-2501(Hidden Gesture button appears after viewer restart)
...
--HG--
branch : product-engine
2009-11-17 20:43:40 +02:00
Brad Payne (Vir Linden)
7202227953
Removed function that was only used for debugging. Defer object suicide until end of the method
...
--HG--
branch : avatar-pipeline
2009-11-17 13:43:12 -05:00
Ramzi Linden
7edbb53b91
L10N: use consistent wording in strings.xml for Away/NotAway and Busy/NotBusy
2009-11-18 02:33:08 +08:00
Ramzi Linden
66979d26bb
L10N: linguistic improvements to some tooltips in floater_tools.xml
2009-11-18 02:15:38 +08:00
Andrew Dyukov
aea6aa0c2b
Fixed minor bug EXT-2507 (Implement some text for empty Picks tab in avatar's Profile ).
...
--HG--
branch : product-engine
2009-11-17 20:09:39 +02:00
Loren Shih
580b2331f5
Added gear menu for outfits panel.
...
--HG--
branch : avatar-pipeline
2009-11-17 13:06:30 -05:00
Loren Shih
aebfdac65f
merge
...
--HG--
branch : avatar-pipeline
2009-11-17 13:06:01 -05:00
James Cook
6253e2611d
merge
2009-11-17 10:03:49 -08:00
James Cook
a2041387b1
Fix broken URL highlighting in local chat, broken in 5068 : ce08ac445035. Typo, not reviewed.
2009-11-17 10:02:01 -08:00
Loren Shih
53beee9e08
EXT-2569 : Separate out LLPanelOutfitsInventory so it's more modular versus being coupled with LLSidepanelAppearance
...
EXT-2561 : Add standard bottom panel (gear menu, add button, trash icon)
Added gear menu and standardized the code. (someday, will create a subclass to share the functionality across panels)
Make LLPanelOutfitsInventory more modular, e.g. it no longer knows about the Wear/Edit buttons.
--HG--
branch : avatar-pipeline
2009-11-17 13:00:26 -05:00
James Cook
ddee62b833
Nudge parabuild
2009-11-17 09:28:23 -08:00
Tofu Linden
ac325092cd
Rebuild linux llqtwebkit/qt with -fno-stack-protector for better runtime compatibility.
...
I hope.
2009-11-17 16:46:52 +00:00
Igor Borovkov
a66aa0fd9a
fixed major EXT-2551 Nearby Chat undocs after minimizing and opening (being docked before)
...
--HG--
branch : product-engine
2009-11-17 18:42:51 +02:00
Tofu Linden
65efbae9af
magickal newline to unbreak linux.
2009-11-17 16:23:59 +00:00
Loren Shih
32dccaf3d8
Sidepanel Appearance refactoring. Work in progress.
...
1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance)
2. Changed some "Looks" names to "Outfits"
3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming)
4. Took out tab from sidepanel_appearance.
--HG--
branch : avatar-pipeline
2009-11-17 10:36:11 -05:00
Brad Payne (Vir Linden)
70b605e419
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
...
--HG--
branch : avatar-pipeline
2009-11-17 10:34:14 -05:00
Brad Payne (Vir Linden)
9c823a1d40
Deferring work to idle time to avoid recursive notifyObservers calls - added wrapper class to defer an arbitrary boost::bind or other callable
...
--HG--
branch : avatar-pipeline
2009-11-17 10:33:47 -05:00
Sergei Litovchuk
4f35650f04
Fixed critical bug EXT-2469 "Viewer crashes in the Floater Call".
...
- Re-factored Floater Call initialization and destruction logic.
- Removing voice channel participants observer when call ends.
--HG--
branch : product-engine
2009-11-17 17:23:07 +02:00
Vadim Savchuk
7b10039d45
merge
...
--HG--
branch : product-engine
2009-11-17 16:41:08 +02:00