summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-23Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference' notification ↵Andrew Dyukov
is shown while connecting to ad-hoc voice chat). Bug consisted of two problems- showing empty outgoing call floater and corrupted text in outgoing call floater. First was ad-hoc and group call specific and was caused by not showing appropriate text for STATE_READY voice channel state. Second was caused by too small space between "Connecting to..." and "Leaving..." textboxes, which enden in their collision for long names. - First problem was fixed by adding STATE_READY case into appropriate switch where textboxes are made visible. - Second was solved by placing "Leaving..." textbox lower Reviewed by Vadim Sachuk at https://codereview.productengine.com/secondlife/r/310/ --HG-- branch : product-engine
2010-04-23fixed EXT-6891 Region name SLurl is absent ot teleport offer toast if long ↵Alexei Arabadji
message was added Decreased limit of teleport offer text invitaton to 178 characters(254 - max_location_url_length(76)) reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/302/ --HG-- branch : product-engine
2010-04-23mergeTofu Linden
2010-04-23Backed out changeset 211aeed4e8f4Tofu Linden
backing out "Switching to 10.5 SDK"
2010-04-23Backed out changeset b379d162769eTofu Linden
2010-04-23Work on task EXT-6722 (Create modified inventory view for "my outfits" tab ↵Mike Antipov
in top-level appearance sidebar) Code improvements: * Moved Accordion tab + Flat list into separate xml. * Implemented dynamic creation of the accordion tab via xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/312/ --HG-- branch : product-engine
2010-04-23Fixed bug EXT-6798 (Crash in LLTeleportHistoryStorage).Vadim Savchuk
Reason: Attempt to purge empty teleport history resulted in inconsistent history state. There were two consequences: 1) Further teleports would not properly update the history. 2) Subscribers of history changes were notified of the invalid change and that led to the crash. My changes: - added a sanity check to LLTeleportHistoryStorage::onTeleportHistoryChange() to prevent the crash - purging empty teleport history now does nothing, hence the history doesn't become inconsistent - removed a redundant (but harmless) call to onTeleportHistoryChanged() from LLNavigationBar::draw() because it's called by LLTeleportHistory::purgeItems() anyway Reviewed by Mike at https://codereview.productengine.com/secondlife/r/304/ --HG-- branch : product-engine
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23fixed linux buildIgor Borovkov
no review, no jira issue --HG-- branch : product-engine
2010-04-23mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-23fix for EXT-6999 Group creation panel: pop-up menu for empty group title ↵Yuri Chebotarev
editfield has 'Delete' item enabled reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/307/ --HG-- branch : product-engine
2010-04-23EXT-6970 Title of attachment from previously viewed group can be found in ↵Yuri Chebotarev
current group while viewing notices reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/306/ --HG-- branch : product-engine
2010-04-23fix EXT-6766 The number of characters allowed in the Chat Edit Window in ↵Yuri Chebotarev
Vewer 2 is 1/2 that in Vewer 1 reviewed Mike Antipov https://codereview.productengine.com/secondlife/r/305/ --HG-- branch : product-engine
2010-04-23fix for EXT-5839 Creating a new wearable in a localized viewer attempts to ↵Yuri Chebotarev
use non-ascii characters for inventory types in some languages reviewed Richard Nelson https://codereview.productengine.com/secondlife/r/61/ --HG-- branch : product-engine
2010-04-23mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-23Manual merge from default branch.Vadim Savchuk
Semi-automatically resolved conflicts in: * BuildParams * indra/newview/CMakeLists.txt * indra/newview/llviewermessage.cpp --HG-- branch : product-engine
2010-04-23Restore a bit of the non-deferred renderer's sun/moon waterglow in deferred ↵Tofu Linden
rendering. This also adds a slight pinch of glow to shiny sun-spots. So be it. (transplanted from 5a0d9e5b5cfb2ecd96685f0275ab8e999ab86263) (transplanted from 90f0ce75b2d7bb9fc03e84245db27a16508cde63)
2010-04-23mergeIgor Borovkov
--HG-- branch : product-engine
2010-04-23completed EXT-6721 (Enable UI for user modification of wearable order)Igor Borovkov
- added functionality to change order of wearables - added ad-hoc up and down buttons on a button bar ("up" means closer to the body) - https://jira.secondlife.com/secure/attachment/38464/screenshot-1.jpg - added displaying wearables as sorted by order on the Edit Outfit panel (top list) Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/280/ --HG-- branch : product-engine
2010-04-23Related to EXT-1655 ([BSI] Always flying after pressing "Stand" to stand up ↵Eugene Mutavchi
from an object) - disabled forcing of flying at autopilot stops (for "Sit" autopilot behavior). Reviewed by Tofu Linden at https://codereview.productengine.com/secondlife/r/253/ --HG-- branch : product-engine
2010-04-23mergeTofu Linden
2010-04-23Backed out changeset 4627863f43d5Tofu Linden
back-out this backout. change made in viewer-trunk, reverted in viewer-hotfix, but we want it preserved post-merge.
2010-04-23merge from viewer-hotfixTofu Linden
2010-04-23merge from PE's viewer-trunkTofu Linden
2010-04-23mergeTofu Linden
2010-04-23Fixed normal bug EXT-6729 ([TRUNCATION] SELECTOR DE COLOR. \"(arrástralo ↵Paul Guslisty
abajo para g\" should be \"(arrástralo abajo para guardarlo)\" or...) - Deleted overriden dimensions in FR locale Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/291/ --HG-- branch : product-engine
2010-04-23Fixed normal EXT-6927 (Vertical tabs not attached to tab panel)Paul Guslisty
- Decreased space between tabs and panel in tab container Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/297/ --HG-- branch : product-engine
2010-04-23Fixed normal bug EXT-6904 (Edit Appearence panel has UI corrupted in IT)Paul Guslisty
- Main changes: - Increased floater, tabcontainer, scrollcontainer and 'Revert' button width - Made layout of Item Action Label and 'Save', 'Save As', 'Revert' buttons equally for all panels Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/288/ --HG-- branch : product-engine
2010-04-23Fixed normal EXT-6845 ([TRUNCATION] Media Control. \"Parar tod\" - \"Iniciar ↵Paul Guslisty
to\") - Increased buttons width and panel width Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/295/ --HG-- branch : product-engine
2010-04-23Fixed normal EXT-6841 ([TRUNCATION] Sidebar > People. Choose and show a ↵Paul Guslisty
group > Land/ Assets. \"No tienes permiso para ver el terreno propiedad del g\") -Applied ward wrap for comments in scroll list Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/298/ --HG-- branch : product-engine
2010-04-23Fixed normal bug EXT-6651 ([HARDCODE] System message in Nearby Chat window ↵Paul Guslisty
appears in EN) - Added instead of hardcoded string two strings to the strings.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/294/ --HG-- branch : product-engine
2010-04-22fix eolRoxie Linden
2010-04-22Fix test build breakRoxie Linden
2010-04-22automated mergeRoxie Linden
2010-04-22DEV-49332 - cryptic error message when typing in single username when ↵Roxie Linden
logging into maingrid. Needs to be changed when IE is checked in, of course. Now we check the expected credential formats for a given grid against the format that is typed in, and throw an error if it's invalid.
2010-04-22ssreflections: dampen/blur ssreflections rather more.Tofu Linden
(transplanted from 4c4ae8d8f0795244fda258c157177e2778bfc444)
2010-04-22mergeTofu Linden
2010-04-22Backed out changeset 78dddb3a1dd3Tofu Linden
2010-04-22mergeTofu Linden
2010-04-22Backed out changeset 4e01b259fdd4Tofu Linden
2010-04-22mergeTofu Linden
2010-04-22Backed out changeset 5d5e820de3efTofu Linden
2010-04-22mergeTofu Linden
2010-04-22Backed out changeset 8d006f07bf22Tofu Linden
2010-04-22mergeTofu Linden
2010-04-22Backed out changeset 24ced5703710Tofu Linden
2010-04-22mergeTofu Linden
2010-04-22Backed out changeset 491edf15255aTofu Linden
2010-04-22trivial: convert to unix eol.Xiaohong Bao