summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-04-20Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-20additional commit for EXT-6625 Nearby Chat does not gain focus when clicked ↵Yuri Chebotarev
at the top reply to https://codereview.productengine.com/secondlife/r/267/#review471 add comments to code --HG-- branch : product-engine
2010-04-20fix after wrong merge for EXT-4082 - long stringYuri Chebotarev
--HG-- branch : product-engine
2010-04-20mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-20Fixed normal bug EXT-6807(Object's chicklet shows context menu for bottom bar)Eugene Mutavchi
- moved the common code (menu stuff handling) from LLIMP2PChiclet, LLAdHocChiclet, LLIMGroupChiclet to their parent LLIMChiclet - added popup menus to LLInvOfferChiclet and LLScriptChiclet (notice that just the closing menu item was added because these chiclets are not connected with IM sessions.) Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/254/ --HG-- branch : product-engine
2010-04-20fix for EXT-6625 Nearby Chat does not gain focus when clicked at the topYuri Chebotarev
https://codereview.productengine.com/secondlife/r/267/ mantipov --HG-- branch : product-engine
2010-04-20fix for EXT-6037 Nearby Speakers floater does not remember size and position ↵Yuri Chebotarev
on relogging https://codereview.productengine.com/secondlife/r/270/ reviewed mantipov --HG-- branch : product-engine
2010-04-20fix for EXT-4082 Normal Uploading huge image crashes viewerYuri Chebotarev
https://codereview.productengine.com/secondlife/r/11/ reviewed Tofu Linden --HG-- branch : product-engine
2010-04-20Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/Alexei Arabadji
--HG-- branch : product-engine
2010-04-20fixed major EXT-6905 Inventory offer from another resident appears like ↵Alexei Arabadji
notification from object; Fixed regression introduced by rev. 050ab9232a5a, provided passing payload parameter "give_inventory_notification" to notification. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/273/ --HG-- branch : product-engine
2010-04-20merge from viewer-hotfixTofu Linden
2010-04-20Fixed EXT-6930(normal) - Edit Outfit: "Add wearables" panel layout is broken.Dmitry Zaporozhan
NOTE: this is a temporary fix, see EXT-6564(Fix wearable editing panels) for more info. Fix info: - Moved edit wearable button to place where it does not break widget paddings. - Updated code that calculates button position. - Sending button to front to ensure it is clickable and visible. Not reviewed. --HG-- branch : product-engine
2010-04-20trivial comment fix.Tofu Linden
2010-04-20merge from PE's viewer-trunkTofu Linden
2010-04-20Merge hotfixbeta into hotfixKent Quirk
2010-04-20Fixed EXT-6542(normal) - [HARD CODED] - Land-Info, Medien: none/none needs ↵Dmitry Zaporozhan
to be localized Added "DefaultMimeType" string to strings.xml to make "none/none" mime type localizable. Replaced all occurrences of "none/none" string with call to static method. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/265/ --HG-- branch : product-engine
2010-04-20Fixed normal bug EXT-6837 ([TRUNCATION] Mundo > Sol > Editor del entorno > ↵Paul Guslisty
Cielo avanzado > Editor del ciclo de un día. \"Configuración del fotograma clav\" should be \"Configuración del fotograma clave\".) - Some redesign of floater_day_cycle. - Main changes: increased view_border size; moved controls to the right of increased view_border to the right; increased spinner width to see all its content; moved 'Play' and 'Stop!' buttons in one row with 'Use estate time' button. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/258/ --HG-- branch : product-engine
2010-04-20Fixed normal bug EXT-6817 ([TRUNCATION] Mundo > Perfil del lugar > ↵Paul Guslisty
Region/Estate > REGIÓN/ESTADO > Estado. txt overlap the nexts windows.) - Increased panel and view_border size, moved name_lists to the right Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/257/ --HG-- branch : product-engine
2010-04-20Fixed normal EXT-6729 ([TRUNCATION] SELECTOR DE COLOR. \"(arrástralo abajo ↵Paul Guslisty
para g\" should be \"(arrástralo abajo para guardarlo)\" or...) - Applied word wrap Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/264/ --HG-- branch : product-engine
2010-04-20Fixed normal bug EXT-6801 (EXT-6801 ([TRUNCATION] multiple langs. Me > ↵Paul Guslisty
preferences > graphic > advanced)) - Made labels of sliders wider - Increased distance between radio groups Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/263/ --HG-- branch : product-engine
2010-04-19Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfixMonroe Linden
2010-04-19Fix for EXT-6925 (Mime type association missing for video/* wildcard).Monroe Linden
In mime_types*.xml, added <impl> sections to the mimetype entries for video/* and audio/* which point to the quicktime plugin on Mac/Windows and gstreamer on Linux. Reviewed by Callum at http://codereview.lindenlab.com/1252035
2010-04-19mergeRichard Nelson
2010-04-19EXT-6921 - Media Volume Changes changes system volume on WinXPRichard Nelson
reviewed by Callum
2010-04-19MergeEli Linden
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19For EXT-6809 - fixes suggested by Nyx code reviewBrad Payne (Vir Linden)
2010-04-19Fixed bug EXT-6852 ([STRING IN EN] Media settings : Owner, Group, and Anyone).Vadim Savchuk
Added names to nameless textboxes. Trivial change, not reviewed. --HG-- branch : product-engine
2010-04-19Unhardcoded snapshot upload price in my fix for EXT-6606 (Set As Profile Pic ↵Vadim Savchuk
uploads and charges user L$10 without confirmation). Reviewed by Richard: https://codereview.productengine.com/secondlife/r/217/ --HG-- branch : product-engine
2010-04-19Fixed bug EXT-6842 ([I18N] Date format in Profile - mm/dd/yyyy needs to be: ↵Vadim Savchuk
yyyy/mm/dd for Japanese). - Made avatar registration date localizeable. - Specified localization templates for English, Japanese and German. Reviewed by Mike: https://jira.secondlife.com/browse/EXT-6842 --HG-- branch : product-engine
2010-04-19Fixed normal bug EXT-6899 (String changes to default and null results Groups ↵Mike Antipov
List help text) * Updated help texts in Groups List according to requirements in the ticket. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/260/ --HG-- branch : product-engine
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19repair merge from viewer-hotfix w.r.t. agent API changes.Tofu Linden
2010-04-19fixed EXT-6848 Avoid creation of dummy objects in LLOnlineStatusToast and ↵Alexei Arabadji
LLPanelGenericTip classes. * decoupled tip toast panel related logic from class LLTast; * moved documentation comment of LLPanelGenericTip constructor from .cpp to .h file; * corrected name attribute in panel_generic_tip.xml; reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/230/ --HG-- branch : product-engine
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-19merge from viewer-hotfixTofu Linden
2010-04-19Fixed windows EOLs.Mike Antipov
--HG-- branch : product-engine
2010-04-19mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-19Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-19Fixed normal bug EXT-6896 (String changes to default help text in Friends, ↵Mike Antipov
Nearby and Recent lists) * Updated default help text in Friends, Nearby and Recent lists according to requirements in the ticket. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/259/ --HG-- branch : product-engine
2010-04-19Fixed normal bug EXT-6864 (Resident-related menu items are enabled/displayed ↵Mike Antipov
for PSTN bridge callers) * Disabled all currently processed menu items related to interaction with a resident for Avaline callers. * Added enable callback for View Profile menu item to disable it for Avaline callers. * Disabled menu items related to text chat. Full list is: - View Profile - Add Friend - IM - Call - Share - Pay - Block Text - Moderate Options: -- Allow Text chat DEV notes: To process moderation options separate "on_enable handler" was created for group moderate actions. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/261/ --HG-- branch : product-engine
2010-04-19merge from PE's viewer-hotfixTofu Linden
2010-04-19merge from PE's viewer-trunkTofu Linden
2010-04-19trivial comment fix.Tofu Linden
2010-04-19Change Linux fasttimer implementation back to RDTSC - using a reliable ↵Tofu Linden
syscall was REALLY chewing CPU time. Sigh. I didn't realize how incredibly often this gets called. So, back to the assembly. But be more careful with CPU clock count on linux, so the fasttimer values are much more accurate than they were the last time we were with RDTSC, in absolute terms - back in the right order of magnitude anyway. Also change many instances of Mhz to MHz. Also some minor comment fixes.
2010-04-19Fixed major bug EXT-6682 (Emptying Lost & Found Folder can crash Viewer2.0 ↵Mike Antipov
if recent item was added) Reason: a pointer to renamed item was not nullified in Folder View when rename control lost focus. Fix: updated focus lost callback to nullify the pointer to renamed item. Had to made this callback non-static to have access to Folder View's member pointer. Also made "New..." menu items disabled for Lost & Found folder. Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/251/ --HG-- branch : product-engine
2010-04-19Updated the reverted fix for critical bug EXT-1655 ([BSI] Always flying ↵Eugene Mutavchi
after pressing "Stand" to stand up from an object), also integrated the fix for EXT-6786 ('Stand' button is corrupted if movement control floater is opened). Added some clarifying comments. Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/. --HG-- branch : product-engine
2010-04-19completed EXT-6764 Implement filtering of wearables (combobox options: ↵Igor Borovkov
Clothes/Body, Objects, All) on Add to Outfit subpanel Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/221/ --HG-- branch : product-engine
2010-04-19Update for major task EXT-6564 - Fix wearable editing panels.Dmitry Zaporozhan
Added temporary "edit" button to outfit list to allow QA test new wearable edit panels. Was not reviewed. --HG-- branch : product-engine