summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true ↵jenn
to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15Merge for STORM-1482Aaron Stone
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how ↵Aaron Stone
to clean up.
2011-07-15If we're going to need indra.base.llsd, have to munge sys.path.Nat Goodspeed
And at that point, the Python logic needed to bring in the llsd module is big enough to warrant capturing it in a separate string variable common to multiple tests.
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-15Not all TC agents have llbase.llsd, fall back to indra.base.llsdNat Goodspeed
2011-07-15STORM-1482 Change the defaults, look in the app_settings dir for configs as ↵Aaron Stone
well.
2011-07-15Try again to pacify VS fatal warning.Nat Goodspeed
2011-07-15Muzzle VS warningNat Goodspeed
2011-07-15merge changes for storm-1509Oz Linden
2011-07-15Add test to verify Python-to-C++ LLSD notation sequence.Nat Goodspeed
Verify that an LLSD::String containing newlines works; verify that newlines between items are accepted.
2011-07-15STORM-1506 FIXED Reset the estate to global sun when changing region ↵Vadim ProductEngine
environment settings. By the way, moved estate info storage from the REGION/ESTATE floater to a model class.
2011-07-15Add test to verify C++-to-Python LLSD notation sequence.Nat Goodspeed
Write a sequence of LLSDSerialize::toNotation() calls separated by newlines to a data file, then read lines and parse using llbase.llsd.parse(). Verify that this produces expected data even when one item is a string containing newlines. Generalize python() helper function to allow using any of the NamedTempFile constructor forms. Allow specifying expected Python rc (default 0) and use this to verify an intentional sys.exit(17). This is better than previous sys.exit(0) test because when, at one point, NamedTempFile failed to write file data, running Python on an empty script file still terminates with rc 0. A nonzero rc verifies that we've written the file, that Python is running it and that we're retrieving its rc.
2011-07-15Change NamedTempScript to NamedTempFile; allow streaming to it.Nat Goodspeed
The only thing about NamedTempScript that was specific to script files was the hardcoded ".py" extension. Renaming it to NamedTempFile with an explicit extension argument addresses that. Allow constructing NamedTempFile with either a std::string, as before, or an expression of the form (lambda::_1 << some << stuff). If Linden's Boost package included the Boost.Iostreams lib, we could even stream such an expression directly to an ostream constructed around the fd. But oh well.
2011-07-14Pacify Linux gcc more thoroughly.Nat Goodspeed
2011-07-14#include correct headers for Windows _open() et al.Nat Goodspeed
Also mollify Linux build, which gets alarmed when you implicitly ignore write()'s return value. Ignore it explicitly.
2011-07-14Avoid Boost.Filesystem: Boost package improperly built on Windows?Nat Goodspeed
Seems Linden's Boost package and the viewer build might use different settings of the /Zc:wchar_t switch. Anyway, this implementation using open(O_CREAT | O_EXCL) should be more robust. I'm surprised Boost.Filesystem doesn't seem to offer "create a unique file"; all I found was "generate a random filename fairly likely to be unique."
2011-07-14FIX STORM-1494 remove duplicate ID and xml snippeteli
2011-07-14wstring_to_utf8str() accepts LLWString rather than std::wstring.Nat Goodspeed
2011-07-14STORM-1234 FIXED text editor selection which was skipping the last character ↵Seth ProductEngine
in line. Added handling of the wrapped lines case when calculating the starting position for selection. The bug is a regression caused by the fix of STORM-320 which was dealing with calculating the position of the input cursor while navigating through the lines of text with word wrapping enabled.
2011-07-14Use Linden wstring-to-string conversion, not boost::filesystem's.Nat Goodspeed
On Windows, calling boost::filesystem::path::string() implicitly requests code conversion between std::wstring (the boost::filesystem::path::string_type selected on Windows) and std::string. At least for integration-test program, that produces link errors. Use Linden's wstring_to_utf8str() instead.
2011-07-14STORM-1482 Little bit of Windows crash report value logging.Aaron Stone
2011-07-14Attempt to fix minor build errors on Windows.Nat Goodspeed
2011-07-14Eliminate use of PATH_MAX, which is bogus anyway.Nat Goodspeed
2011-07-14merge changes for 2.7.5 releaseOz Linden
2011-07-14New llsdserialize_test logic needs Boost.Filesystem library.Nat Goodspeed
That, in turn, needs Boost.System library.
2011-07-14Work around broken Windows command-line processing.Nat Goodspeed
It's wonderful that the Python interpreter will accept a whole multi-line script as a composite -c argument... but because Windows command-line processing is fundamentally flawed, we simply can't count on it for Windows. Instead, accept script text, write a temporary script file in a system- dependent temp directory, ask Python to run that script and delete the file. Also, on Windows, use _spawnl(), much simpler than adding bizarre Windows wait logic to LLProcessLauncher. Use LLProcessLauncher only on Mac & Linux, with waitpid() to capture rc.
2011-07-14mergeDave Parks
2011-07-13Still trying to fix Windows header-file-order problem.Nat Goodspeed
2011-07-13Attempt to fix confusing header-file-order problems on Windows.Nat Goodspeed
2011-07-13merge changes for storm-1507Oz Linden
2011-07-13merge changes for open-99Oz Linden
2011-07-13Introduce support for C++ integration tests running Python scripts.Nat Goodspeed
This is in its infancy; tested on Mac; needs to be ironed out on Windows and Linux. Goal is to test at least some cross-language LLSD serialization.
2011-07-13SH-1637 FIX, SH-1638 FIX - fixes jittery camera problemsBrad Payne (Vir Linden)
2011-07-13STORM-1503 FIXED Find floater doesn't set focus to its browser.Paul ProductEngine
Added tab stop for browser to get focus when find floater is focused.
2011-07-13STORM-1502 FIXED Disable "Delete Water/Sky/Day Preset" dialogs if no user ↵Vadim ProductEngine
presets exist.
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, ↵jenn
used during crash pile-on). Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
2011-07-12CHOP-753: Eliminate redundant array-of-pair-arrays in LLMemoryInfo.Nat Goodspeed
(per Monty code review) The notion of storing LLMemoryInfo data both as an LLSD::Map and an LLSD::Array of pair arrays arose from a (possibly misguided) desire to continue producing stats output into the viewer log in the same order it always used to be produced. There is no evidence that anyone cares about the order of those stats in the log; there is no other use case for preserving order. At Monty's recommendation, eliminate generating and storing the array-of-pair-arrays form: directly store LLSD::Map.
2011-07-12Merge for STORM-1482Aaron Stone
2011-07-12STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some ↵Aaron Stone
cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
2011-07-12CHOP-753: Defend against boost::regex exceptions.Nat Goodspeed
(per Monty code review) Explain why we intentionally don't suppress exceptions from boost::regex objects constructed with string literals. Catch std::runtime_error from boost::regex_search() and boost::regex_match(); log and return false.
2011-07-12CHOP-753: make getAvailableMemoryKB() only load data on Windows.Nat Goodspeed
(per Monty code review) Other platforms return -1 anyway, so don't need to call load methods.
2011-07-11Build fix for Mac OS X.Leslie Linden
2011-07-11merge changes for storm-1315Oz Linden
2011-07-11merge changes for storm-1459Oz Linden
2011-07-11merge changes for storm-1325Oz Linden
2011-07-11Automated merge with ↵Xiaohong Bao
https://bitbucket.org/squire_linden/viewer-development-crash-horde
2011-07-11more fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-11more fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]