summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-06merge from viewer-2-0Tofu Linden
2010-04-06Resurrect 'Sun' menu options.Tofu Linden
These seem to have been clobbered by some bad XML merging that probably came in with 73f60e5518af / EXT-3531
2010-04-06automated mergeLoren Shih
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically Preliminary work to clean up naming conventions.
2010-04-06wtf-fix for using \\ instead of // as a comment.Tofu Linden
2010-04-06merge from PE viewer-hotfixTofu Linden
2010-04-06mergeTofu Linden
2010-04-05MergeEli Linden
2010-04-05ES fix unlocalized sidepanel titlesEli Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup for LLInventoryFunctions. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-05automated mergeLoren Shih
2010-04-02merge hotfix changes to releaseKent Quirk
2010-04-02Updated Mac build of LLQtWebKit library.Monroe Linden
This was built from: revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-02Merge with tipCallum Prentice
2010-04-02DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of ↵Callum Prentice
LLQtWebKit/Windows)
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-02EXT-6690 shorten PL translationEli Linden
2010-04-02DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of ↵Callum Prentice
LLQtWebKit/Windows)
2010-04-02mergeTofu Linden
2010-04-02Updated Mac build of LLQtWebKit library.Monroe Linden
This was built from: revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-02Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is ↵Monroe Linden
questionable) * remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer. * replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive * don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in) Reviewed by Richard at http://codereview.lindenlab.com/1218007
2010-04-02VWR-17709 en_xui_change to accommodate the longest translation in PL even ↵Eli Linden
though this is a bug reported for ES; undo JA old override
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-02mergeBrad Payne (Vir Linden)
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-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-02CleanupBrad Payne (Vir Linden)
2010-04-02PE mergeTofu Linden
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