Commit Graph

12313 Commits (affefe2361ee73eee60bca42e3edb41c65ffa95d)

Author SHA1 Message Date
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
Loren Shih 1df1c36f36 merge up from viewer-development 2010-09-08 13:38:25 -04:00
Loren Shih 5b017f14bc automated merge 2010-09-08 13:37:27 -04:00
Loren Shih 074f4c8c59 VWR-22901 FIXED Backwards compatibility for multiattachments
Better handling of invalid attachment points.
You can now detach points that are incompatible with your viewer, versus having those permanently in the COF>
2010-09-08 13:36:42 -04:00
Tofu Linden a2fb3fabc7 merge 2010-09-08 18:21:03 +01:00
Nyx (Neal Orman) bb51a764ec SNOW-606 FIX disable packaging of libuuid
Patch taken from JIRA, committing locally to fix our project branch.
Code reviewed by Nyx / Brad
(transplanted from 06c4d6b5d67f6624d76b5a7f61021ef2d53f44b4)
2010-09-08 11:30:50 -04:00
Aimee Linden 0b4046ecf1 VWR-20713 SUPPLEMENTARY Double-click Teleport. Correct menu item label. 2010-09-07 21:14:58 +01:00
Aimee Linden 4991d7903d Merge 2010-09-07 21:10:41 +01:00
Xiaohong Bao a0611b5a01 Automated merge with http://bitbucket.org/TheShining/viewer-development 2010-09-07 13:27:49 -06:00
Tofu Linden eb10840623 Fix some build errors. 2010-09-07 18:16:46 +01:00
Aimee Linden bd734e3198 VWR-21253 MERGE Permission icons in the friends list 2010-09-07 17:55:10 +01:00
Xiaohong Bao 497d35af48 fix for VWR-22813: crash at [1] LLImageBase::allocateData(int) [secondlife-bin llimage.cpp] 2010-09-07 10:48:06 -06:00
Loren Shih 16031c354f automated merge from viewer-development 2010-09-07 10:23:19 -04:00
Andrew Dyukov a30bc718bb VWR-22690 FIXED Implemented save/load of bottomtray button order.
- Added methods responsible for saving and loading order of buttons to bottomtray. Order is saved after each drag'n'drop to
ensure user's customization of bottomtray is not lost because of crash.

- Added additional argument to layoutstack movePanel() method which tells it to move panel to the beginning of mPanels vector
without requiring a pointer to panel before which it should be inserted.

Reviewed by Vadim Savchuk.
2010-09-06 22:56:14 +03:00
Andrew Dyukov e04dabd2b3 VWR-20705 VWR-20706 FIXED Implemented drag'n'drop of buttons in bottomtray.
- Though visually user drags buttons, layout panels are really moved. To move one panel before other, new method movePanelBeforeOther() was added to layout stack.

- When drag'n'drop is finished, order of panels in layout stack mToolbarStack is changed, and also order vectors are updated in bottomtray.These are vectors mButtonsProcessOrder and mButtonsOrder. mButtonsOrder was introduced in this changeset to store order of all bottomtray buttons that may change place via drag'n'drop and should save and load it between sessions. mButtonsProcessOrder is not enough for it because it contains only buttons that may be hidden(and for example Speak button is not included in it).

- To pass mouse events from buttons to bottomtray, new class LLBottomtrayButton was added (and new widget bottomtray_button for it).

Reviewed by Vadim Savchuk.
2010-09-06 21:35:01 +03:00
Tofu Linden ebfbaad969 merge for several of VWR-20694's subtasks. 2010-09-06 16:58:26 +01:00
Vadim Savchuk 94af8b77df VWR-20696 ADDITIONAL FIX Added and made use of new dock/undock icons. 2010-09-06 17:33:48 +03:00
Tofu Linden cb14dc9ada SRCH-465 Classifieds titles and descriptions are too long. 2010-09-06 13:42:19 +01:00
Tofu Linden 0be40c91e6 merge Ardy Lay's VWR-19499 / SNOW-652 fix. 2010-09-06 12:45:45 +01:00
Boroondas Gupte a18e83e060 re-merged VWR-20583 2010-09-05 23:07:02 +02:00
Boroondas Gupte 5ead04fb46 VWR-22113 FOLLOWUP fixed indentation
... and changed jira issue ID in comment to the current one
2010-09-04 21:54:46 +02:00
Tofu Linden a04da8fe75 integrate patch from VWR-22113 'crash hunters - crash, possibly on exit when disconnected' 2010-09-04 19:00:49 +01:00
Tofu Linden 19d097efb3 merge for VWR-20974 2010-09-04 18:39:58 +01:00
Sergei Litovchuk 21d4429caa VWR-21585 FIXED My Inventory and My Appearance side panels layout to support horizontal resizing.
Added minimal width for detached side panel floater.
2010-09-04 01:24:15 +03:00
Kent Quirk b2eb877d52 vwr-20945 - make menu bar blue when using a project viewer 2010-09-03 17:37:17 -04:00
Vadim Savchuk 3a07996af1 VWR-20696 ADDITIONAL FIX Fixed broken buttons in detached sidebar panels.
Buttons belonging items of some FlatListView instances didn't work (i.e. click on them didn't invoke the callback)
if the list was inside a detached sidebar tab.
I'm working around that by a simple XML fix (disabled focusing the broken buttons), but the issue needs further investigation.
Affected panels: avatar list, group list, teleport history.

Reviewed by Sergey Litovchuk
2010-09-03 23:08:43 +03:00
Paul Guslisty 5342df4434 VWR-21585 WIP Added support of horizontal resizing for Home, Me, People and Places tabs 2010-09-03 21:35:23 +03:00