Commit Graph

12184 Commits (ac500df89e09cd133d60d309a20bd6fbf0cfefb7)

Author SHA1 Message Date
Andrew Meadows ac500df89e Post-convert merge by convert_monolith.py from http://hg.lindenlab.com/brad/viewer-simconsole 2010-09-10 15:39:20 -07:00
convert-repo e98aeea556 update tags 2010-09-11 06:36:06 +00:00
Tofu Linden 1f46b1d87b merge storm-93 2010-09-10 17:47:49 +01:00
Tofu Linden 02fac56357 merge STORM-89 2010-09-10 17:47:05 +01:00
Tofu Linden 064f30d1d2 merge SNOW-98 2010-09-10 17:45:42 +01:00
Tofu Linden 8e0c5946e6 merge SNOW-91 2010-09-10 17:44:53 +01:00
Vadim Savchuk d8b76f6c7f STORM-98 FIXED Updated art for People and Groups default/placeholder icons.
Replaced the old icons with the ones provided by Epic.
2010-09-10 19:24:24 +03:00
Tofu Linden 540a5982a4 merge. 2010-09-10 16:54:38 +01:00
Tofu Linden fb7f560f83 Fix Linux build failure... one would hope. 2010-09-10 16:53:38 +01:00
Paul Guslisty 36f3535f70 STORM-93 FIXED Added Take Off function to the gear menu and implemented this functionality using helper methods:
canTakeOffSelected() - checking whether selected item(s) can be taken off
hasItemSelected() - checking whether any item selected
getSelectedItemsUUIDs() - returns selected items ids
2010-09-10 15:59:35 +03:00
Paul Guslisty 88fb1034f3 STORM-91 FIXED Corrupted vertical scroll bar appears on 'Edit Outfit' panel if height of 'Add More' panel was changed
-Increased min height of panel
2010-09-10 14:06:12 +03:00
Aimee Linden d073234832 Merge 2010-09-10 11:51:17 +01:00
Aimee Linden 073d56b0e1 VWR-21253 SUPPLEMENTARY Permission icons in the friends list
Incorporate code review feedback.
2010-09-10 11:49:50 +01:00
Tofu Linden 36b9ee3113 Update BuildParams, hopefully correctly, for new staging area. 2010-09-10 10:29:33 +01:00
Tofu Linden 8a21f5e241 merge the latest ECC/Shining sprint work. http://bitbucket.org/seraph/viewer-development-shining 2010-09-10 10:22:25 +01:00
Tofu Linden 3296f3b864 merge storm-94 2010-09-10 10:21:15 +01:00
Tofu Linden 4e9a17c952 merge storm-97 2010-09-10 10:20:40 +01:00
Paul Guslisty 4c2b8ecf65 STORM-89 FIXED Undocked profile panels loses verb buttons after minimize/restore 2010-09-10 12:17:56 +03:00
Tofu Linden 544ebaddf8 merge STORM-96 / STORM-92 (as part of vwr-20694). 2010-09-10 10:17:39 +01:00
Loren Shih 820cffd56d automated merge 2010-09-09 17:06:51 -04:00
Loren Shih bf7201cf8b dummy commit test 2010-09-09 17:06:37 -04:00
Andrew Dyukov db16219309 STORM-97 FIXED Fixed position of back button in Landmark info panel on width resize
Corrected "follows" attribute for button in xml.
2010-09-09 21:18:35 +03:00
Vadim Savchuk 6b77ce904e STORM-92 FIXED Avoid redundant visibility changes when attaching/detaching side tray tabs.
Also happens to fix STORM-96 (Empty space appears in the top of Home side panel after redocking).
2010-09-09 21:05:13 +03:00
Andrew Dyukov ac833ac83a STORM-94 FIXED Increased minimum width and height allowed for undocked panels.
Set minimum width of undocked panels to their width in sidetray (333). Minimum width was set to 440 to make sure expandable
textbox in My Profile doesn't spread out from floater if it has maximum height.

Reviewed by Vadim Savchuk.
2010-09-09 20:21:11 +03:00
Nyx (Neal Orman) aadebd91de VWR-22052 FIX tons of processAvatarAppearance spam, may be flooding server
Added a timeout so that we will only send this message a max of once a minute.
Investigated cause of server not sending visual params with texture message,
it appears it only happens if the sim cannot find the visual params to send.
Not sure what causes that condition.

Code reviewed by Seraph
2010-09-09 11:25:31 -04:00
Nyx (Neal Orman) 1ed13a1c3f Automated merge with http://bitbucket.org/seraph/viewer-development-shining 2010-09-09 11:08:51 -04:00
Loren Shih f45ca1ed6e automated merge 2010-09-09 11:01:33 -04:00
Loren Shih d5a2eac4ac pull up from viewer-development 2010-09-09 11:01:19 -04:00
Brad Payne (Vir Linden) c8bbe773df dummy whitespace change 2010-09-09 10:52:25 -04:00
Tofu Linden 72e597a6f9 Hmm, the automated backout missed a bit (SNOW-606 fallout). Hopefully this is the magic sauce. 2010-09-09 14:57:57 +01:00
Tofu Linden 332f502ede CID-503
Checker: REVERSE_INULL
Function: LLOutfitsList::refreshList(const LLUUID &)
File: /indra/newview/lloutfitslist.cpp
2010-09-09 13:56:44 +01:00
Tofu Linden bec744b7e0 merge backout. 2010-09-09 13:36:11 +01:00
Tofu Linden 2f7fa7ba20 Backed out changeset 1c8d9c22bf94 2010-09-09 13:36:02 +01:00
Tofu Linden 832b548568 merge backout. 2010-09-09 13:35:42 +01:00
Tofu Linden 989b8cf6b2 Backed out changeset dfb1d2c23122 2010-09-09 13:35:32 +01:00
Tofu Linden 4c667a1051 CID-504
Checker: UNINIT_CTOR
Function: LLWearableItemTypeNameComparator::LLWearableTypeOrder::LLWearableTypeOrder()
File: /indra/newview/llwearableitemslist.h
2010-09-09 13:35:02 +01:00
Tofu Linden f7d51863f9 slightly lame robustification for:
CID-507

Checker: REVERSE_INULL
Function: LLVorbisDecodeState::initDecode()
File: /indra/llaudio/llaudiodecodemgr.cpp
2010-09-09 12:38:03 +01:00
Tofu Linden 31c6ad3d60 CID-508
Checker: UNINIT_CTOR
Function: LLFloaterView::LLFloaterView(const LLFloaterView::Params &)
File: /indra/llui/llfloater.cpp
2010-09-09 12:28:43 +01:00
Tofu Linden 200e8839d7 Massage the SNOW-606 fix to try to make everything (incl. our build machine...) happy. 2010-09-09 12:00:44 +01:00
Brad Payne (Vir Linden) 6181d26dca dummy whitespace change 2010-09-08 17:33:52 -04:00
Loren Shih b52af0d925 automated merge 2010-09-08 17:26:34 -04:00
Loren Shih 8fa0b55ee0 automated merge 2010-09-08 17:16:11 -04:00
Loren Shih f981e5af3f dummy commit test 2010-09-08 17:15:58 -04:00
Brad Payne (Vir Linden) be25594c44 merge 2010-09-08 17:14:59 -04:00
Dave Parks a114783a7b merge 2010-09-08 16:11:54 -05:00
Brad Payne (Vir Linden) bd058cc1a6 merge 2010-09-08 16:48:45 -04:00
Loren Shih 4a8d59367a dummy commit test 2010-09-08 16:27:42 -04:00
Nyx (Neal Orman) 272b6fea1f TEST whitespace change to verify new repository is working 2010-09-08 16:16:07 -04:00
Brad Payne (Vir Linden) 13f1d6e472 dummy whitespace change 2010-09-08 15:55:26 -04:00
Vadim Savchuk 244aa5db98 VWR-22891 FIXED Fixed inability to share an item while My Inventory SP is undocked.
All detached side tray tabs are now wrapped with LLFloaterSideTrayTab that adds them as exceptions to LLTransientFloaterMgr,
i.e. as views clicking on which doesn't hide transient floaters.
2010-09-08 21:23:22 +03:00