summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-02-10CID-425Tofu Linden
Checker: UNINIT_CTOR Function: LLCustomButtonIconCtrl::LLCustomButtonIconCtrl(const LLCustomButtonIconCtrl::Params &) File: /indra/llui/lltabcontainer.cpp
2010-02-10CID 424Tofu Linden
Checker: UNINIT_CTOR Function: LLDragDropWin32Target::LLDragDropWin32Target(HWND__ *) File: /indra/llwindow/lldragdropwin32.cpp
2010-02-10CID-423Tofu Linden
Checker: UNINIT Function: LLVolume::cleanupTriangleData(int, const std::vector<LLVolume::Point, std::allocator<LLVolume::Point>> &, int, int *, int &, LLVector3 **, int &, int **) File: /indra/llmath/llvolume.cpp The code looks right, I'm just adding an llassert().
2010-02-10fix 9d63853d2045 / EXT-651Tofu Linden
that checkin broke the xml and killed the Developer menu - repair it.
2010-02-10PE mergeTofu Linden
2010-02-10PE merge.Tofu Linden
2010-02-10MergeMike Antipov
--HG-- branch : product-engine
2010-02-10Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-02-10mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-10modified icon from ticket EXT-2957Ychebotarev ProductEngine
--HG-- branch : product-engine
2010-02-10partitial fix for normal task EXT-2957 [BSI] Implement object icon for chat ↵Ychebotarev ProductEngine
from objects, instead of using generic image for missing profile picture --HG-- branch : product-engine
2010-02-10Fixed linux build error - added skipped newline at end of fileEugene Mutavchi
--HG-- branch : product-engine
2010-02-10Fixed low bug EXT-5124 - Display buddy icons on online/offline alertsDmitry Zaporozhan
--HG-- branch : product-engine
2010-02-10Fixed function name.Dmitry Zaporozhan
--HG-- branch : product-engine
2010-02-10fixed waiting bug for EXT-4976 IM Window with 'Show End of Last ↵Igor Borovkov
Conversation' turned on, doesnt show Avatar name, or correct information --HG-- branch : product-engine
2010-02-10mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-10fix task EXT-5129 Move Group image and founder name into General accordionYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-09DEV-43688 Cycle3 JA massive linguistic changes by Rika for better UI, post ↵Eli Linden
truncation fix
2010-02-09automated merge viewer2.0->viewer2.0Loren Shih
2010-02-09EXT-3071 : CTRL+I should bring up either inventorySP or inventory floaterLoren Shih
EXT-5239 : Consider removing CTRL+I to spawn multiple inventory windows BTEST-42 : Can't hide inventory by pressing CTRL+I CTRL+I will now either open the inventory sidepanel, or close the sidepanel.
2010-02-09EXT-4602 : Copying folders doesn't workLoren Shih
Folders are back to being no longer copyable.
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-02-09change some llassert_always to llassert in llviewertexture.cppXiaohong Bao
2010-02-09more for EXT-4352: texture problem in viewer 2.0. TEXTURE_CACHE_ENTRY_SIZE ↵Xiaohong Bao
does not match the FIRST_PACKET_SIZE on the sim side.
2010-02-09MergeLeyla Farazha
2010-02-09EXT-4449 [BSI] Zoom In does not function properly on large or linked prim setsLeyla Farazha
reviewed by Richard CC#99
2010-02-09returning take to top level of object context menu. Change was mistakenly ↵Erica
reverted
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-02-09EXT-3980 - Closed folders were being reexpanded unnecessarily during ↵Eric M. Tulla (BigPapi)
inventory search. We now only update the open/closed status when we've updated the filter status. -Reviewed by Richard
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-02-09EXT-4569 alpha preview not working after alpha is savedNyx (Neal Orman)
We were setting the baked texture ID to IMG_INVISIBLE when hitting the save button on the appearance editor to force the right texture IDs to be sent to surrounding viewers. Now, when you make a change after it is saved, it clears this texture ID. This restores expected functionality. Code reviewed by bigpapi. -Nyx
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-02-09more fix for EXT-4352: texture problem in viewer 2.0. fixed texture priority ↵Xiaohong Bao
problem.
2010-02-09PE merge.Tofu Linden
2010-02-09EXT-3651 DEV-44500 Keyboard interaction does not work with Flash mediaTofu Linden
Update llqtwebkit to 4a97db00bfb1 from monroe's extern bb tree
2010-02-09EXT-3651 DEV-44500 Keyboard interaction does not work with Flash mediaTofu Linden
This change lets Linux pass keys through to Flash.
2010-02-09Update of major bug EXT-5022 (streaming media first use dialog should be ↵Eugene Mutavchi
removed) --HG-- branch : product-engine
2010-02-09Fixed normal bug EXT-651 (Upload Image shortcut (Ctrl-U / Cmd-U) does not work)Eugene Mutavchi
--HG-- branch : product-engine
2010-02-09Fixed normal bug EXT-4817 - Preferences > Chat > Alert color preference is ↵Dmitry Zaporozhan
broken --HG-- branch : product-engine
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event use the proper cmake include() so glib is really found!
2010-02-09Fixed normal bug EXT-5119 (Voice Control Panel should open only after call ↵Mike Antipov
is connected, so it's not overlapped by voice notifications.) - updated condition when VCP should be shown to check voice channel state (CONNECTED) --HG-- branch : product-engine
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt.
2010-02-09Fixed normal bug EXT-5244 ( There is no "i" button for Name fields from ↵Mike Antipov
nearby chat) - reason: changes in c91e724d4f15 related to EXT-4547. Also multiple warnings appeared in log: LLView::getChild: Found child named user_name but of wrong type class L LTextBox, expecting class LLViewerTextEditor * - fix: changed template class from LLViewerTextEditor to LLTextBase in getChild. --HG-- branch : product-engine
2010-02-09merge.Tofu Linden
2010-02-09restore trivial llwindowsdl code improvement.Tofu Linden
p.s. previous commit comment should have read 'hopefully trunk-UNbreaking' :) and this overall mergeset is work towards: EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media ... although on linux this does not actually help yet.
2010-02-09mergeTofu Linden
2010-02-09Backed out changeset 0664cf2c9edfTofu Linden
2010-02-09merge.Tofu Linden
2010-02-09Backed out changeset b1c241040751Tofu Linden
2010-02-09upgrade qt+llqtwebkit. not quite as upgraded as it needs to be, but ↵Tofu Linden
hopefully trunk-breaking.