summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-04-06Fixed normal bug EXT-6545 - Admin > God Tools > Object > Sim Name ↵Dmitry Zaporozhan
incorrectly reported. Using region name retrieval code. Fixed labels. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/125/ --HG-- branch : product-engine
2010-04-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-06Fixed normal bug EXT-6464 (Buy pass from popup menu doesn't work).Andrew Dyukov
- The bug was caused by deselection of parcel(because of zero ref count to parcel selection) after appearance of alert with ok/cancel. Added setting pointer to this selection before notification appearance and nullifying pointer it after user chooses ok or cancel. Nullifying will always take place because alert is modal, so there is no chance that LLPanelLandGeneral::cbBuyPass() won't be called. Reviewed by Mike at https://codereview.productengine.com/secondlife/r/180/ --HG-- branch : product-engine
2010-04-06mergeTofu Linden
2010-04-02EXT-6696 : Make Library inventory items somehow distinguishable at first ↵Loren Shih
glance from My Inventory items Library items are now set to Emphasis Color. This can be easily changed. Also fixed an issue where the "(Loading...)" string was overlapping with folder inventory strings.
2010-04-02mergeTofu Linden
2010-04-02EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'sLoren Shih
Fixed some more typedefs that I missed in first checkin.
2010-04-02automated mergeLoren Shih
2010-04-02automated mergeLoren Shih
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02Fixed normal bug EXT-6348 (SLapp world map location does not display the ↵Eugene Mutavchi
correct region) - fixed displaying the world map location for escaped SLapp urls. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/173/. --HG-- branch : product-engine
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02Fixed normal bug EXT-6673 (Default sort order of Nerby People list should be ↵Eugene Mutavchi
by most recent speaker) - corrected the default setting for nearby people sort order. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/175/. --HG-- branch : product-engine
2010-04-02Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-02add some debug code for EXT-5394: Crash in ↵Xiaohong Bao
LLViewerMediaImpl::calculateInterest()
2010-04-02automated mergeLoren Shih
2010-04-02Partial fix for reopened EXT-6357 (SLapp for object chat does display an ↵Eugene Mutavchi
inspector) - changed the order of registering SLURLs so the LLUrlEntryObjectIM will be handled before LLUrlEntryPlace. Reviewed by Vadim Savchuk. --HG-- branch : product-engine
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02No ticket. Fixed Linux build.Eugene Mutavchi
--HG-- branch : product-engine
2010-04-02Completed normal task EXT-6646 ([TRUNCATION] Volume bar truncated.)Mike Antipov
The reason: overridden width attributes in localized files. Fix: remove overrides in 'es', 'fr', 'it', 'pt' locales. But override tab width for 'it' locale to accommodate "Mute when minimized" checkbox on Sound & Media panel. NOTE: there is no enough room for "Mute when minimized" checkbox on Sound & Media panel in 'nl' locale. It requires too much space, about 117 extra px and issue should be moved into separate ticket. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/171/ --HG-- branch : product-engine
2010-04-02mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-02mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-02Manual merge from default branch.Vadim Savchuk
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357. --HG-- branch : product-engine
2010-04-02CleanupBrad Payne (Vir Linden)
2010-04-02Fixed major bug EXT-6595 (World->Place Profile flyout menu doesn't include ↵Vadim Savchuk
link to side panel place info). Added a new main menu item: World -> Place Profile -> Place Profile. I'm not sure about its label though (double "Place Profile"). Reviewed by Sam: https://codereview.productengine.com/secondlife/r/161/ --HG-- branch : product-engine
2010-04-02PE mergeTofu Linden
2010-04-02done EXT-6674 Switch Edit Outfit panel (list at the top) to show content of ↵Igor Borovkov
the Current Outfit system folder reviewed at https://codereview.productengine.com/secondlife/r/159/ --HG-- branch : product-engine
2010-04-02Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) ↵Eugene Mutavchi
- added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/ --HG-- branch : product-engine
2010-04-02Fixed normal bug EXT-5831(Do not apply font color to timestamps in chat ↵Eugene Mutavchi
history) - added new 'ChatTimestampColor' color setting, which is set to timestamps for chat history messages in text mode which are not from log. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/160/. --HG-- branch : product-engine
2010-04-02Automated mergeRoxie Linden
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01Automated MergeRoxie Linden
2010-04-01Incorporate Aimees code review commentsRoxie Linden
2010-04-01another fix for bad mergeRichard Linden
2010-04-01fix for bad mergeRichard Linden
2010-04-01added newline at eofRichard Linden
2010-04-01mergeRichard Linden
2010-04-01EXT-3531 - Ctrl-p doesn't work reliably on loginRichard Linden
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01mergeRichard Nelson
2010-04-01fixed line endingsLeyla Farazha
2010-04-01MergeLeyla Farazha
2010-04-01Cleanup and consolidationBrad Payne (Vir Linden)
2010-04-01EXT-3792 Legacy menus are still displayed in Inventory in Inventory side panelLeyla Farazha
reviewed by Richard CC#176
2010-04-01EXT-5110 Save Outfit dialog is non-standard modal dialog (off-center ↵Leyla Farazha
placement, empty titlebar) reviewed by Richard CC#176
2010-04-01EXT-5179 In Prefs->Setup, move Other Devices to bottom of window or to ↵Leyla Farazha
advanced EXT-5170 prefs review: move UI size to advanced reviewed by Richard CC#176
2010-04-01EXT-5168 prefs review: Remove "Small nametags" optionLeyla Farazha
reviewed by Richard cc#176
2010-04-01EXT-5584 color picker swatches are missing pure red and many common shadesLeyla Farazha
reviewed by Richard cc#176
2010-04-01EXT-6492 - button halign=center doesn't take into account left and right padRichard Linden
2010-04-01automated mergeLoren Shih