summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-11MergeEli Linden
2010-03-11VWR-18254 en_xui_changeEli Linden
2010-03-11VWR-18254 en_xui_changeEli Linden
2010-03-11mergeBrad Payne (Vir Linden)
2010-03-11For EXT-5333: Bodyparts missing from appearance and COF. Recovered wearables ↵Brad Payne (Vir Linden)
were failing to get added correctly due to wrong timeout logic. Reviewed by Nyx.
2010-03-11linguistic changesEli Linden
2010-03-11linguistic changesEli Linden
2010-03-11VWR-18253 en_xui_changeEli Linden
2010-03-11VWR-18253 en_xui_changeEli Linden
2010-03-11EXT-6276 Put in some gl flush calls to texture state functions.Dave Parks
2010-03-11EXT-6276 Put in some gl flush calls to register combiner functions (why ↵Dave Parks
these are being used for UI now is beyond me)
2010-03-11MergeEli Linden
2010-03-11linguistic changeEli Linden
2010-03-11linguistic changeEli Linden
2010-03-11Merge some stuff I'd been saving for viewer 2.1.Tofu Linden
2010-03-11fixed EXT-5904 “Offers embedding into IM windows”,Alexei Arabadji
revised embedding and logging offer notification to provide loading log entry in case notification doesn't exist; --HG-- branch : product-engine
2010-03-11merge from viewer-2-0Tofu Linden
2010-03-11fix line ending in file llfloater.cppangela
2010-03-11merge.Tofu Linden
2010-03-11The 'strict' fix for EXT-6288. Stricter than the lower-risk fix which is ↵Tofu Linden
intended for viewer 2.0.
2010-03-11mergeangela
2010-03-11Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2010-03-10mergeRichard Nelson
2010-03-10mergeRichard Nelson
2010-03-11merge from repoangela
2010-03-10EXT-6295 - Cannot log in with new account, TOS dialog does not loadRichard Nelson
reviewed by Mani
2010-03-11Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2010-03-10a try to fix EXT-5845: crash on LLTexLayerTemplate::render [secondlife-bin ↵Xiaohong Bao
lltexlayer.cpp:1898]
2010-03-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-10debug code for EXT-6093: crash at LLTextureCache::updateTextureEntryList ↵Xiaohong Bao
[secondlife-bin lltexturecache.cpp:847]
2010-03-10debug code for EXT-5599: Viewer crashes consistently, in Linden Homes region.Xiaohong Bao
2010-03-10Fix for EXT-6276.Monroe Linden
Added a check in LLTextBase::drawSelectionBackground() to keep it from sending degenerate rectangles to gl_rect_2d(). This seems to be what was causing the GL state to go bad. Reviewed by Richard at http://codereview.lindenlab.com/534001
2010-03-10First draft of changes for avatar outfit panel, so PE can start working on it.Nyx (Neal Orman)
Demo code, will get cleaned up / extended through future work on the project - just need to check it in to collaborate.
2010-03-10Clean up login page a bitRoxie Linden
2010-03-10VWR-18046 en_xui_changeEli Linden
2010-03-10VWR-18046 en_xui_changeEli Linden
2010-03-10MergeEli Linden
2010-03-10linguistic changeEli Linden
2010-03-10linguistic changeEli Linden
2010-03-10Automated merge with https://hg.productengine.com/secondlife/viewer-offers/Alexei Arabadji
--HG-- branch : product-engine
2010-03-10fixed EXT-5904 “Offers embedding into IM windows”,Alexei Arabadji
shortened timestamp of embedded offers; unified sender name of session message entry and file log entry for system messages; --HG-- branch : product-engine
2010-03-10Implemented normal sub-task EXT-5909(Accepted/declined inventory offer ↵Andrew Dyukov
shouldn't spawn chiclet). - Removed check for INVENTORY_DECLINED from LLHandlerUtil::canSpawnIMSession(). - Added new method LLHandlerUtil::canSpawnToast() and check with it to LLTipHandler::processNotification() to supress toasts when respective IM window is open. --HG-- branch : product-engine
2010-03-10fixed EXT-5910 “Offers logging”,Alexei Arabadji
replaced interactive system message marker with correct from string value when message logged without adding to the session; --HG-- branch : product-engine
2010-03-10Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-10fixed EXT-4872 'Loading...' message remains in ad-hoc IM floated opened by ↵Igor Borovkov
'Start IM' button added timing out of session initialization (after 30 seconds) --HG-- branch : product-engine
2010-03-10merge from viewer-2-0Tofu Linden
2010-03-10PE mergeTofu Linden
2010-03-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Lynx Linden
2010-03-10EXT-6114: Ignore secondlife:///app/login SLapps if logged in.Lynx Linden
If you were already logged in, clicking on these SLapps would crash your viewer (crash was in experimental reg-in-client code). We now ignore these SLapps if the user is already logged in, and a one-time warning is emitted in this case.
2010-03-10Update for major bug EXT-5942 - Entering a Classified with a banned keyword ↵Dmitry Zaporozhan
doesn't publish, and doesn't let you edit. Updated code for disabling verbs for unpublished classified. --HG-- branch : product-engine