summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-03-14merge changes for 3.7.3-releaseOz Linden
2014-03-14STORM-1831 initialize LLKeywords::mLoaded in constructor (fixes ↵Oz Linden
black-on-black text in various places)
2014-03-14correct logging levels (ERR causes a crash), and a minor style fixOz Linden
2014-03-10increment viewer version to 3.7.4Oz Linden
2014-03-09storm-1831 Fixing identificaton of label for highlighting.Ima Mechanique
2014-03-06storm-1831: Fixing constants not getting highlighted. Fixing ratation ↵Ima Mechanique
constant treated as string. Adding logging of unrecognised token groups.
2014-03-06Removing duplicate entry from colors.xmlIma Mechanique
2014-03-06storm-1831 Changes in postBuild to use onFileFetchedCallbackIma Mechanique
2014-03-06storm-1831 Converting LLSyntaxIdLSL to a singleton. Adding callback for ↵Ima Mechanique
signalling arrival of Syntax file from capability.
2014-03-03[MAINT-3555][MAINT-3703]Baker Linden
- Removed logging for MAINT-3555 - Added NULL guard to fix MAINT-3703 (hopefully)
2014-02-27Merge JJ's viewer-release-codesign-workaroundsimon
2014-02-26Fix linux build - make default check in switch statementSimon Linden
2014-02-26Merged lindenlab/viewer-release into defaultJames Johnson
2014-02-26MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoidsimon
about the return type for calls to LLView::getParent(): never assume a down cast is possible.
2014-02-25Merge viewer-releasesimon
2014-02-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
- Removed a lot of logging code to reduce application close time
2014-02-25fix typoOz Linden
2014-02-25don't use the simulator channel in the keywords cache file nameOz Linden
2014-02-25keywords_lsl_default.xml updates from the simulator treeOz Linden
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-25merge latest changes from Ima with 3.6.14-releaseOz Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-21changed variable names and errors to more accurately reflect the operation ↵JJ Linden
being performed
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash
2014-02-20Fix build problemmaksymsproductengine
2014-02-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg
2014-02-14increment viewer version to 3.7.2Oz Linden
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-11Hack to fix ACME-1317Cho
2014-02-10increment viewer version to 3.7.1Oz Linden
2014-02-06Refactoring to better check state of loading and to allow clearing of ↵Ima Mechanique
highlighting if we don't have a valid keywords file.
2014-02-06Adding clear methods to remove any highlighting.Ima Mechanique
2014-02-06Changing how state of loading is reported to better allow other classes to ↵Ima Mechanique
know what is happening.
2014-02-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- memory leaks fixing;
2014-02-14Merge viewer-release with 3.7.1simon
2014-02-14More memory cleanup of containers after DeletePairedPointer() usage.simon
2014-02-14MAINT-3724 : LLWorld::addRegion logging is misleadingsimon
2014-02-14mergeBaker Linden
2014-02-14[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdownBaker Linden
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-11MAINT-3639 disable ALM for OSX 10.6.8Graham Madarasz (Graham Linden)
2014-02-10Merge viewer-releasesimon
2014-02-10MAINT-3710 FIXED List of members is removed from General tab. Title column ↵Mnikolenko ProductEngine
is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now.
2014-02-05Checking version for cached files so older versions cannot sneak through on ↵Ima Mechanique
upgrading of format.
2014-02-05Cleaning up a little. Using assigned values for simFeature/Capability name ↵Ima Mechanique
instead of literal values.
2014-02-01MergeIma Mechanique
2014-01-31strom-1831 Cleaning up a number of issues raised.Ima Mechanique
Adding some constants and member variables. Moving arguments into constructor signature and adding new signature. Breaking saving of file into its own method to separate it from checking the LLSD. Cleaning up severla of the logging messages. Differentiating between successful and failed loads/fetches using sLoaded/sLoadFail.
2014-01-30fix odd editor artifactOz Linden
2014-01-30Another build triggerMonty Brandenberg