summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-09-10merge.Tofu Linden
2010-09-10Fix Linux build failure... one would hope.Tofu Linden
2010-09-10MergeAimee Linden
2010-09-10VWR-21253 SUPPLEMENTARY Permission icons in the friends listAimee Linden
Incorporate code review feedback.
2010-09-10merge the latest ECC/Shining sprint work. ↵Tofu Linden
http://bitbucket.org/seraph/viewer-development-shining
2010-09-10merge storm-94Tofu Linden
2010-09-10merge storm-97Tofu Linden
2010-09-10merge STORM-96 / STORM-92 (as part of vwr-20694).Tofu Linden
2010-09-09automated mergeLoren Shih
2010-09-09dummy commit testLoren Shih
2010-09-09STORM-97 FIXED Fixed position of back button in Landmark info panel on width ↵Andrew Dyukov
resize Corrected "follows" attribute for button in xml.
2010-09-09STORM-92 FIXED Avoid redundant visibility changes when attaching/detaching ↵Vadim Savchuk
side tray tabs. Also happens to fix STORM-96 (Empty space appears in the top of Home side panel after redocking).
2010-09-09STORM-94 FIXED Increased minimum width and height allowed for undocked panels.Andrew Dyukov
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-09VWR-22052 FIX tons of processAvatarAppearance spam, may be flooding serverNyx (Neal Orman)
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-09Automated merge with http://bitbucket.org/seraph/viewer-development-shiningNyx (Neal Orman)
2010-09-09pull up from viewer-developmentLoren Shih
2010-09-09Hmm, the automated backout missed a bit (SNOW-606 fallout). Hopefully this ↵Tofu Linden
is the magic sauce.
2010-09-09CID-503Tofu Linden
Checker: REVERSE_INULL Function: LLOutfitsList::refreshList(const LLUUID &) File: /indra/newview/lloutfitslist.cpp
2010-09-09merge backout.Tofu Linden
2010-09-09Backed out changeset 1c8d9c22bf94Tofu Linden
2010-09-09merge backout.Tofu Linden
2010-09-09Backed out changeset dfb1d2c23122Tofu Linden
2010-09-09CID-504Tofu Linden
Checker: UNINIT_CTOR Function: LLWearableItemTypeNameComparator::LLWearableTypeOrder::LLWearableTypeOrder() File: /indra/newview/llwearableitemslist.h
2010-09-09slightly lame robustification for:Tofu Linden
CID-507 Checker: REVERSE_INULL Function: LLVorbisDecodeState::initDecode() File: /indra/llaudio/llaudiodecodemgr.cpp
2010-09-09CID-508Tofu Linden
Checker: UNINIT_CTOR Function: LLFloaterView::LLFloaterView(const LLFloaterView::Params &) File: /indra/llui/llfloater.cpp
2010-09-09Massage the SNOW-606 fix to try to make everything (incl. our build ↵Tofu Linden
machine...) happy.
2010-09-08automated mergeLoren Shih
2010-09-08automated mergeLoren Shih
2010-09-08dummy commit testLoren Shih
2010-09-08mergeBrad Payne (Vir Linden)
2010-09-08mergeDave Parks
2010-09-08mergeBrad Payne (Vir Linden)
2010-09-08dummy commit testLoren Shih
2010-09-08TEST whitespace change to verify new repository is workingNyx (Neal Orman)
2010-09-08dummy whitespace changeBrad Payne (Vir Linden)
2010-09-08VWR-22891 FIXED Fixed inability to share an item while My Inventory SP is ↵Vadim Savchuk
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-08merge up from viewer-developmentLoren Shih
2010-09-08automated mergeLoren Shih
2010-09-08VWR-22901 FIXED Backwards compatibility for multiattachmentsLoren Shih
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-08mergeTofu Linden
2010-09-08SNOW-606 FIX disable packaging of libuuidNyx (Neal Orman)
Patch taken from JIRA, committing locally to fix our project branch. Code reviewed by Nyx / Brad (transplanted from 06c4d6b5d67f6624d76b5a7f61021ef2d53f44b4)
2010-09-07Automated merge with http://bitbucket.org/TheShining/viewer-developmentXiaohong Bao
2010-09-07Fix some build errors.Tofu Linden
2010-09-07VWR-21253 MERGE Permission icons in the friends listAimee Linden
2010-09-07fix for VWR-22813: crash at [1] LLImageBase::allocateData(int) ↵Xiaohong Bao
[secondlife-bin llimage.cpp]
2010-09-07automated merge from viewer-developmentLoren Shih
2010-09-06VWR-22690 FIXED Implemented save/load of bottomtray button order.Andrew Dyukov
- 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-06VWR-20705 VWR-20706 FIXED Implemented drag'n'drop of buttons in bottomtray.Andrew Dyukov
- 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-06merge for several of VWR-20694's subtasks.Tofu Linden
2010-09-06VWR-20696 ADDITIONAL FIX Added and made use of new dock/undock icons.Vadim Savchuk