summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2015-04-28Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-04-23increment viewer version to 3.7.29Oz Linden
2015-04-14remove dead member variablesOz Linden
2015-04-14MAINT-5097 FIXED crash in LLFloaterPay::onGiveandreykproductengine
2015-04-14remove disabled codeOz Linden
2015-04-14merge changes for MAINT-5090Oz Linden
2015-04-14MAINT-5090 Remove disabling HTTP Inventory from ViewerMnikolenko ProductEngine
2015-04-14merge changes for STORM-2113Oz Linden
2015-04-13merge changes for 3.7.27-releaseOz Linden
2015-04-13increment viewer version to 3.7.28Oz Linden
2015-04-11STORM-2113 - uri parsing cleanup and fixesCinder
2015-04-10restore the ll[io]fstream because we need them as wrappers on Windows for ↵Oz Linden
wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-08fix validity errors in settings filesOz Linden
2015-04-07replace llifstream and llofstream with std::ifstream and std::ofstream ↵Oz Linden
respectively
2015-04-07convert llifstream and llofstream to std::ifstream and std::ofstream ↵Oz Linden
respectively
2015-04-02detect xml errors in parsing xml files and remove those filesOz Linden
2015-04-02add catch for possible exception in llsechandler_basic destructor (crash on ↵Oz Linden
exit)
2015-04-02improve logging of machine id generationOz Linden
2015-04-02improve logging of errors in default permissions capOz Linden
2015-04-02improve notice clarityOz Linden
2015-03-30MAINT-3585 FIXED (Crashes when attempting to upload image.)ruslantproductengine
2015-03-27MAINT-4718 FIXED Context menu Open button is always disabled for no-copy ↵Mnikolenko ProductEngine
textures in task inventory
2015-03-24Merge with viewer-release and become 3.7.27andreykproductengine
2015-03-24MAINT-5023 URIparser crash in LLUrlEntryBase::urlToLabelWithGreyQueryMnikolenko ProductEngine
2015-03-24MAINT-5024 crash in LLInspectToastandreykproductengine
2015-03-23increment viewer version to 3.7.27Oz Linden
2015-03-17MAINT-4971 FIXED [MAINT-RC] Own avatar is often totally invisible at login ↵ruslantproductengine
with no way to fix apart from a relog. Other avatars are also often invisible.
2015-03-16MAINT-4974 FIXED Complete name should be used in ↵Mnikolenko ProductEngine
LLAvatarActions::buildResidentsString only when building name string for share confirmation dialogs
2015-03-06MAINT-4967 FIX - log spam removedBrad Payne (Vir Linden)
2015-03-05Simplify CMake code to generate viewer_version.txt and summary.json.Nat Goodspeed
The quoting used for the cygwin printf command didn't work for 'cmake -E echo'. The whole content was enclosed in single quotes, with individual string elements enclosed in double quotes. But we ended up with a summary.json containing (e.g.): '{Type:viewer,Version:3.7.26.33262}' instead of the desired: {"Type":"viewer","Version":"3.7.26.33262"} HOWEVER: I see no compelling reason why either of these files must be deferred to build time. It's simpler and more robust to generate them both directly from CMake at configure time.
2015-03-04MAINT-4858 FIXBrad Payne (Vir Linden)
2015-03-04MAINT-4943 FIXED Crash on locationruslantproductengine
2015-03-03Commit Callum's fix to eliminate dependency on cygwin printf.Nat Goodspeed
Use 'cmake -E echo' instead.
2015-03-23correct merge errorOz Linden
2015-03-23merge changes for 3.7.26-releaseOz Linden
2015-03-17improve file name handling and clean up some error checksOz Linden
2015-03-17MAINT-4995: fix stored favorites for login bar (close input files before ↵Oz Linden
opening them for writing)
2015-02-25mergeBrad Payne (Vir Linden)
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-02-24increment viewer version to 3.7.26Oz Linden
2015-02-24merge changes for MAINT-4790Oz Linden
2015-02-13Merge viewer-release and become 3.7.25Mnikolenko ProductEngine
2015-01-30MAINT-4853 FIXED Pressing the ENTER key when entering a location into the ↵Mnikolenko ProductEngine
Type a location field, doesn't log you in
2015-01-30MAINT-4853 FIXED Pressing the ENTER key when entering a location into the ↵Mnikolenko ProductEngine
Type a location field, doesn't log you in
2015-01-23MAINT-4833 Fixed Warning treated as errorruslantproductengine
2015-01-22MAINT-4790 WIP Previously selected login location is correctly shown now. ↵Mnikolenko ProductEngine
Font on the Log In button was changed back. Text offset was set for Locations combobox.
2015-01-19MAINT-4790 WIP Show focused background image for login text fields.Mnikolenko ProductEngine
2015-01-15SL-92 WIP - more on hover managementBrad Payne (Vir Linden)
2015-01-14SL-92 WIP - more on region notification and managing hoverBrad Payne (Vir Linden)
2015-01-14MAINT-4790 WIP code clean-upMnikolenko ProductEngine