summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-09-13Merge with http://hg.secondlife.com/viewer-development after migrationAndrew Meadows
of Brad's simconsole work.
2010-09-10Post-convert merge by convert_monolith.py from ↵Andrew Meadows
http://hg.lindenlab.com/brad/viewer-simconsole
2010-09-10Pull from lindenlab/viewer-developmentMerov Linden
2010-09-10merge storm-93Tofu Linden
2010-09-10merge STORM-89Tofu Linden
2010-09-10merge SNOW-98Tofu Linden
2010-09-10merge SNOW-91Tofu Linden
2010-09-10STORM-98 FIXED Updated art for People and Groups default/placeholder icons.Vadim Savchuk
Replaced the old icons with the ones provided by Epic.
2010-09-10merge.Tofu Linden
2010-09-10Fix Linux build failure... one would hope.Tofu Linden
2010-09-10STORM-93 FIXED Added Take Off function to the gear menu and implemented this ↵Paul Guslisty
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-10STORM-91 FIXED Corrupted vertical scroll bar appears on 'Edit Outfit' panel ↵Paul Guslisty
if height of 'Add More' panel was changed -Increased min height of panel
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-10STORM-89 FIXED Undocked profile panels loses verb buttons after minimize/restorePaul Guslisty
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-09VWR-22759 : port of SNOW-667, fix drop down mangled language spellingMerov Linden
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-09Pull from lindenlab/viewer-developmentMerov Linden
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