8b56d0bece
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-18 12:02:04 -08:00
6b81dfb139
Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory manager
...
Reviewed by Bao
2009-11-18 11:59:09 -08:00
1875d5e37b
EXT-2539 confirm we're not sending local texture IDs in appearance msg
...
created a throwaway function to temporarily set local texture IDs in the avatar
object to IMG_DEFAULT_AVATAR immediately before sending the TE message, and
restore the IDs when we're done. Will implement a more elegant solution for 2.1.
This is the least risky implementation, though it isn't elegant.
Code reviewed by Seraph
2009-11-18 14:48:05 -05:00
22aa5eed91
merge.
2009-11-18 10:43:30 +00:00
125b779fb6
merge
2009-11-17 23:39:42 -08: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
521820ad8d
Merge of avatar-pipeline branch into viewer2
2009-11-17 19:08:13 -05:00
e6caf96b0a
post viewer2 merge compile fix (minor)
...
--HG--
branch : avatar-pipeline
2009-11-17 19:03:30 -05:00
913eff0f67
merge
2009-11-17 15:15:23 -08:00
3217887356
Merge of viewer2 into avp
...
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05: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
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
3b3fa1c0ab
Merge from product-engine
2009-11-17 12:37:00 -08:00
c76ab6c4b7
Fixed normal bug EXT-2108 (Home panel isn't resized).
...
--HG--
branch : product-engine
2009-11-17 22:17:34 +02:00
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
2365dbcd45
merge
2009-11-18 03:15:30 +08:00
d6bbc652de
L10N: fix a typo in a localized label
2009-11-18 02:53:44 +08:00
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
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
939e48d38c
merge.
2009-11-17 18:35:38 +00:00
7edbb53b91
L10N: use consistent wording in strings.xml for Away/NotAway and Busy/NotBusy
2009-11-18 02:33:08 +08:00
66979d26bb
L10N: linguistic improvements to some tooltips in floater_tools.xml
2009-11-18 02:15:38 +08:00
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
580b2331f5
Added gear menu for outfits panel.
...
--HG--
branch : avatar-pipeline
2009-11-17 13:06:30 -05:00
aebfdac65f
merge
...
--HG--
branch : avatar-pipeline
2009-11-17 13:06:01 -05:00
6253e2611d
merge
2009-11-17 10:03:49 -08:00
a2041387b1
Fix broken URL highlighting in local chat, broken in 5068 : ce08ac445035. Typo, not reviewed.
2009-11-17 10:02:01 -08:00
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
ddee62b833
Nudge parabuild
2009-11-17 09:28:23 -08:00
ac325092cd
Rebuild linux llqtwebkit/qt with -fno-stack-protector for better runtime compatibility.
...
I hope.
2009-11-17 16:46:52 +00:00
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
65efbae9af
magickal newline to unbreak linux.
2009-11-17 16:23:59 +00:00
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
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
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
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
7b10039d45
merge
...
--HG--
branch : product-engine
2009-11-17 16:41:08 +02:00
402e957c56
Merge from default branch.
...
Added missing trailing newline to fix Linux build.
--HG--
branch : product-engine
2009-11-17 16:36:22 +02:00
0422eadf2a
implemented major EXT-2523 The minimize button should hide undocked IM windows, not minimize them
...
--HG--
branch : product-engine
2009-11-17 16:28:47 +02:00
0336752a5e
Implemented normal task EXT-1551-[BSI] Add scrollbar to group notice notification
...
--HG--
branch : product-engine
2009-11-17 16:07:01 +02:00
53be27e742
fox4 low task EXT-2480 Open Blocked List panel when blocking an object from nearby chat console
...
--HG--
branch : product-engine
2009-11-17 14:40:02 +02:00
2105e9c716
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-11-17 14:33:43 +02:00
d43e33400a
implemented EXT-2515 "Docked floaters should be resizeable";
...
--HG--
branch : product-engine
2009-11-17 14:33:07 +02:00
4c623cb7bb
completed major task EXT-2516 Remove the close button from IM window title
...
--HG--
branch : product-engine
2009-11-17 14:02:52 +02:00
acd1743a96
Fixed minor bug EXT-1230 ('Block object by name' btn doesn't have a tool-tip).
...
--HG--
branch : product-engine
2009-11-17 13:58:06 +02:00
Palmer