summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-06-21Remove tab chars inherited with file...Nat Goodspeed
2010-06-21Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nat Goodspeed
2010-06-21mergeBrad Payne (Vir Linden)
2010-06-21EXT-4919 WIP - log file spam reductionBrad Payne (Vir Linden)
2010-06-21Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nat Goodspeed
2010-06-21ND-46735 WIP JA and ES translation for set 12, new filesEli Linden
2010-06-21ND-46735 WIP JA and ES translation for set 12Eli Linden
2010-06-21removed unused stringsRichard Nelson
2010-06-21Automated merge with ssh://192.168.2.107/c:/linden/viewer-release/Nat Goodspeed
2010-06-21EXT-7926: fix broken LD_LIBRARY_PATH handling on Windows.Nat Goodspeed
Recent checkins introduced two different CMake macros SET_TEST_LIST (which returned a CMake list of PATH directory strings) and SET_TEST_PATH (which returned a single platform-appropriate PATH string). On Windows, whose path-separator character is ';', SET_TEST_PATH interacted badly with CMake: in CMake, a single string containing ';' characters is indistinguishable from a list of strings. Eliminate the return-single-string form, redirecting the name SET_TEST_PATH to the macro that returns a CMake list. Make LL_TEST_COMMAND expect a list value, prepending each directory string with run_build_test.py's -l switch.
2010-06-21EXT-4919 WIP - fixed problems with inventory fetch failing to time out, ↵Brad Payne (Vir Linden)
added copying/activation of more gesture folders
2010-06-21Automated merge with ssh://hg.lindenlab.com/q/viewer-release/Nat Goodspeed
2010-06-21MergeAimee Linden
2010-06-21DEV-36437 FIXED (VWR-2485) Menu remains after switch to MouselookAimee Linden
Ported from Snowglobe.
2010-06-21DEV-36441 FIXED Minor coding standards fix-up to previous fix for VWR-14765.Aimee Linden
2010-06-21EXT-7777 Just added more descriptive comment.Mike Antipov
--HG-- branch : product-engine
2010-06-21Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-06-21EXT-7921 FIXED Added a check whether message is what we expecting in ↵Mike Antipov
LLInventoryAddItemByAssetObserver::changed. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/618/ --HG-- branch : product-engine
2010-06-19EXT-7945 FIXED Duplicate XUI ID in floater_voice_effect.xmlAimee Linden
2010-06-18Specify a MIME type in the navigate in ↵Monroe Linden
LLFloaterBuyCurrencyHTML::navigateToFinalURL(), so it can skip the MIME type probe.
2010-06-18ND-47486 WIP Italian translation for set12, new filesEli Linden
2010-06-18ND-47486 WIP Italian translation for set12Eli Linden
2010-06-18MD-47488 WIP German translation for set 12, new filesEli Linden
2010-06-18MD-47488 WIP German translation for set 12Eli Linden
2010-06-18Unmount Mac .sparseimage in case of errors while mounted.Nat Goodspeed
DarwinManifest.package_finish() creates and mounts a .sparseimage file, populating it with the desired package contents before creating a .dmg from it. However, errors while it's mounted would formerly bypass the 'hdiutil detach' command that unmounts it, leaving the host in a confused state that seemed to prevent subsequent retry attempts from succeeding. Also add code to try to diagnose/bypass mysterious SetFile -a V filename errors, so far without much luck.
2010-06-18Make run_command() use subprocess.Popen() rather than os.popen().Nat Goodspeed
This lets us capture the command's stderr as well as stdout. I've been perplexed recently by errors from Mac SetFile commands that didn't report stderr.
2010-06-18Centralize LD_LIBRARY_PATH logic with new SET_TEST_PATH macro.Nat Goodspeed
Add ${SHARED_LIB_STAGING_DIR_RELEASE} to LD_LIBRARY_PATH for executing tests: otherwise Debug-build tests can't find (e.g.) the aprutil DLL, for which we don't build/package a debug variant. Leverage discovery that a CMake macro can accept a target variable name argument for LL_TEST_COMMAND macro.
2010-06-18EXT-4388 Crash in octree line segment intersection code (getMask)Karl Stiefvater (qarl)
2010-06-18simple mergeKarl Stiefvater (qarl)
2010-06-18EXT-7446 Spatial Partition CrashKarl Stiefvater (qarl)
2010-06-18MergeLeyla Farazha
2010-06-18EXT-7152 TOS breaks Critical Message in 2.0.0 and 2.0.1Leyla Farazha
removed cancel button
2010-06-18EXT-7910 allow GPU and feature table to load from a custom locationKarl Stiefvater (qarl)
2010-06-18EXT-7821 FIXED Editor type was changed to the type as in "Name:" editor in ↵Vladimir Pchelko
"My Inventory"->"Object Profile". Fix details: Using line_editor instead of text_editor. Enabled ascii filter for entering, because (for example) Russian charters corrupts outfit items and makes Edit Outfit very buggy. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/608/ --HG-- branch : product-engine
2010-06-18mergeTofu Linden
2010-06-18Fix llpreviewgesture.h build borkage.Tofu Linden
2010-06-18EXT-7933 FIXED Slim down the Voice Morph preview floaterAimee Linden
2010-06-18Automated merge with https://hg.productengine.com/secondlife/viewer-release/Alexei Arabadji
--HG-- branch : product-engine
2010-06-18EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided ↵Alexei Arabadji
logging of 'item shared' message instead of spawning IM session and add message to it. Details: 1 Corrected 'ItemsShared' notification message. 2 Avoided spawning session on item shared event. 3 Provided logging of item shared message. 4 Provided logging of 'IMSystemMessageTip' notification without opened related IM session. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/ --HG-- branch : product-engine
2010-06-18mergeTofu Linden
2010-06-18EXT-7777 WIP Implemented loading indicator for "Save" and "Save As" actions ↵Mike Antipov
in "My Outfits" & "Edit Outfit" Panels. EXT-7929 FIXED Updated functionality of attaching object: loading indicator gets hidden when attaching is completed. - Fixed crash when accessing singleton on application exit. - Updated functionality of attaching object: loading indicator was not hidden. * Reason: link to attachment was created without next appearance updating. * Fix: passed "true" into LLAppearanceMgr::addCOFItemLink to call LLAppearanceMgr::updateAppearanceFromCOF when attachments is completed. (Like for clothing). Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/611/ --HG-- branch : product-engine
2010-06-18automated mergeLoren Shih
2010-06-18EXT-5808 FIXED Added another context menu. Also Navigation Bar and ↵Andrew Polunin
Mini-Location bar are mutually exclusive now - Implemented context menu for Mini-Location bar (menu_topinfobar.xml) - Implemented function show_topinfobar_context_menu() (in llviewermenu.h) which displays context menu for Mini-Location bar. - Functions toggle_show_navigation_panel() and toggle_show_mini_location_panel() modified so that Navigation Bar and Mini-Location bar are mutually exclusive (when the former is visible the latter is hidden and vice versa). - Implemented method LLPanelTopInfoBar::onContextMenuItemClicked which handles \"landmark\" and \"copy\" Mini-Location bar context menu actions. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/607/ --HG-- branch : product-engine
2010-06-18merge from PE's viewer-releaseTofu Linden
2010-06-18Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-06-18EXT-7847 FIXED Disabled "trash" button if an item is selected inside ↵Andrew Dyukov
selected outfit. - Added bool mItemSelected variable and getter for it to determine if the selection inside outfit exists, and used it when determining whether to enable "Trash" button in My Outfits. Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/600/ --HG-- branch : product-engine
2010-06-18EXT-7754 FIXED Implemented marking of worn outfit accordion header text with ↵Andrew Dyukov
bold - Added method to LLAccordionCtrlTabHeader which allows to change style of its textbox - Added method to LLOutfitsList which marks accordion header of currently selected otfit and tied it up to BOF callbacks Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/609/ --HG-- branch : product-engine
2010-06-18EXT-7766 FIX change the order of processing url matching and linebreaksYuri Chebotarev
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/596/ --HG-- branch : product-engine
2010-06-18EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image ↵Yuri Chebotarev
segment from being created if this flag is set. reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/587/ --HG-- branch : product-engine
2010-06-17mergeDave Parks