summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-29Manual merge from default branchVadim Savchuk
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version. --HG-- branch : product-engine
2010-03-29The linux counterpart to changeset 818541c93c7cTofu Linden
2010-03-29done EXT-6547 Rename stuff related with Panel Look Info to Panel Outfit EditIgor Borovkov
renamed panel_look_info.xml to panel_outfit_edit.xml renamed llpanellookinfo.cpp/llpanellookinfo.h to llpaneloutfitedit.cpp/llpaneloutfitedit.h renamed LLPanelLookInfo to LLPanelOutfitEdit Reviewed at https://codereview.productengine.com/secondlife/r/130/ --HG-- branch : product-engine
2010-03-28viewer-2-0 mergeTofu Linden
2010-03-27IT translation review of set3Eli Linden
2010-03-27merge from viewer-2-0Tofu Linden
2010-03-26PL CT global editEli Linden
2010-03-26fix invalid xmlEli Linden
2010-03-26MergeEli Linden
2010-03-26IT translation review for set6CEli Linden
2010-03-26PT linguisticEli Linden
2010-03-26Merge.Kent Quirk
2010-03-26MergeKent Quirk
2010-03-26Fix application icon position for MacKent Quirk
2010-03-26Fix "clear cookies" not clearing cookies in some casesMonroe Linden
LLViewerMedia::clearAllCookies was sending "clear cookies" messages to all plugins and deleting cookie files, but it wasn't clearing the cookies in the central store. It now does all of the above.
2010-03-26Fix for EXT-6573 (Mouse-steering doesn't work in third person view)Monroe Linden
LLAgentCamera::cameraOrbitAround() (which had been created from LLAgent:: cameraOrbitAround() when LLAgentCamera was factored out) wasn't correctly processing yaw. Specifically, since gAgent.getFrameAgent() returns by value and not reference, gAgent.getFrameAgent().rotate() was discarding the result of the rotation. Changed LLAgentCamera::cameraOrbitAround() to use gAgent.yaw() instead, and changed LLAgent::getFrameAgent() to return a const reference instead of a value, which should make the compiler catch errors like this. Reviewed by Richard in http://codereview.lindenlab.com/1153001
2010-03-26IT translation review for set6A; FR and ES linguisticEli Linden
2010-03-26mergeRichard Nelson
2010-03-26EXT-EXT-6317 - cursor does not indicate clicking will trigger an action when ↵Richard Nelson
over transparent objects reviewed by Leyla
2010-03-26MergeEli Linden
2010-03-26ES linguisticEli Linden
2010-03-26DE FR ES linguisticEli Linden
2010-03-26DA CT editEli Linden
2010-03-26Fix a couple of minor issues with the central cookie storage code.Monroe Linden
Made LLViewerMedia::clearAllCookies() delete the new per-user cookie file (userdir/plugin_cookies.txt) as well as the old one. Made LLViewerMedia::loadCookieFile() send the clear_cookies message to all loaded plugins.
2010-03-26IT translation for set5CEli Linden
2010-03-26Implemented central storage mechanism for media plugin cookies.Monroe Linden
Added LLPluginCookieStore, which manages the central list of cookies. New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f). Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately. Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies. Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively). Reviewed by Richard at http://codereview.lindenlab.com/1006003
2010-03-26MergeKent Quirk
2010-03-26FR linguisticEli Linden
2010-03-26MergeKent Quirk
2010-03-26EXT-3818 -- absolute minimal fix for Viewer 2, can be better fixed in 2.1. ↵Kent Quirk
Previous proposed fix caused a crash on at least one machine, too risky.
2010-03-26Merge patches in q/viewer-hotfix to viewer-2-0Mark Palange (Mani)
2010-03-26EXT-6517 Now updating the location value in refreshLocation.Mark Palange (Mani)
Reviewed by Richard
2010-03-26MergeKent Quirk
2010-03-26MergeKent Quirk
2010-03-26Related to normal bug EXT-6345 (SLapp group profile does not display group ↵Eugene Mutavchi
name.) - fixed group info panel title to show "Loading..." while waiting for group info. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/124/ --HG-- branch : product-engine
2010-03-26Fixed normal bug EXT-6353 (SLapp chat cannot chat spaces).Eugene Mutavchi
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/119/ --HG-- branch : product-engine
2010-03-26Fixed bug EXT-6399 (System locale is the same for all languages).Vadim Savchuk
Problem: * English locale was set for all languages. * Specifying a correct locale didn't affect anything, including date/time formatting. My investigation has shown that LLStringUtil was instantiated twice: in the main binary and in libllcommon.so. Because LLStringUtil::setLocale() was called from newview and getLocale() was called from llcommon, they effectively used *different* instances of LLStringUtil::sLocale. Hence getLocale() always returned empty string. This seems to be caused by get/setLocale() methods not being dllexported. The fix instantiates get/setLocale() and sLocale in llcommon and exposes them to use from newview (i.e. prevents multiple instantiation). Besides, I specified correct locale names for all languages and platforms. Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/104/ --HG-- branch : product-engine
2010-03-26Fixed bug EXT-6268 (Group spawns Resident inspector when called from About ↵Vadim Savchuk
Land > Objects for group deeded object) Reason: groups were added to the list as avatars, which led to invoking incorrect inspector on hover. Also added a fix for potential crash on hovering name list items. Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/110/ --HG-- branch : product-engine
2010-03-26Manual merge from default branchVadim Savchuk
Resolved conflict in indra/newview/llviewerwindow.cpp. --HG-- branch : product-engine
2010-03-26Backed out changeset 686628355e4a as it caused a crash.Kent Quirk
2010-03-26Fixed normal bug EXT-5116 (Voice notification should display on top of IM ↵Mike Antipov
window, not under.) Replaced sending voice notifications to front (in floater view) with adding them to popup view. In this case Voice Notifications are shown on top even IM window has focus. And Resident can continue enter the text when Voice notification is shown. Reviewad by Vadim at https://codereview.productengine.com/secondlife/r/120/ --HG-- branch : product-engine
2010-03-26Fixed normal bug EXT-6448 (People -> My Friends list has overlapping text at ↵Mike Antipov
the top covering the first few contacts.) Unfortunately I was unable to reproduce this bug. But I have some idea about the reason of it. Decision to show or not the help text based on count of people in Inventory/Calling Cards/Friends/All list. So, if this list is empty even if Resident has some friend (and at least one of them is online) both help text & online list were shown at the same time. The reason of why Friends/All can be empty in inventory can be clean cachу & slow connection to upload it from the server. But I could not reproduce it. So, the fix is to check both all friends & online friends lists to prevent overlaping in the future. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/118/ --HG-- branch : product-engine
2010-03-26Fix for EXT-3818 -- back out some code that was put in for EXT-6373, but ↵Kent Quirk
overreached.
2010-03-26mergeYuri Chebotarev
--HG-- branch : product-engine
2010-03-26fix forYuri Chebotarev
EXT-6475 Scrollbar in the Notices panel is semitransparent and overlaps controls (also for EXT-6374 Side Panel> Create a Notice> dialog boxes overrun up/down slider) https://codereview.productengine.com/secondlife/r/100/ reviewed Leyla Farazha ,vsavchuk --HG-- branch : product-engine
2010-03-26EXT-6514 -- backing out my incorrect fix for this and putting in the one ↵Kent Quirk
from PE.
2010-03-26automated mergeLoren Shih
2010-03-26Fixed normal bug EXT-6070 - Truncated strings in window to buy linden dollarsDmitry Zaporozhan
Increased textbox width. French translation is the longest so other languages will be ok. Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/114/ --HG-- branch : product-engine
2010-03-26Fixed major bug EXT-6544 - remove Admin > God Tools > Grid > Kick All ↵Dmitry Zaporozhan
Residents button. Removed "Kick all" button and corresponding code. Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/117/ --HG-- branch : product-engine
2010-03-26Fixed normal bug EXT-6331 (Gestures floater has an extra column titled \"1\")Paul Guslisty
- Corrected wrong indexes at the point of adding gestures to the gestures list. Problem probably is a result of 'copy & paste'. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/113/ --HG-- branch : product-engine