summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-07-13Attempt to fix confusing header-file-order problems on Windows.Nat Goodspeed
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-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-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-11CHOP-753: Add classic-C-style diagnostics around popen("vm_stat").Nat Goodspeed
On Mac, where LLMemoryInfo relies on a child process rather than any sort of internal system API, try to produce more informative LL_WARNS output if popen() fails to run vm_stat, or if vm_stat terminates with nonzero rc.
2011-07-11CHOP-753: Add timestamp to LLMemoryInfo's LLSD stats block.Nat Goodspeed
For postprocessing these stats, we'll want the time at which they were captured. We'll want the current framerate too, but handle that at a higher level.
2011-07-07CHOP-753: have to cast pointer passed to GetProcessMemoryInfo().Nat Goodspeed
GetProcessMemoryInfo() is prototyped with PROCESS_MEMORY_COUNTERS*, so to accept PROCESS_MEMORY_COUNTERS_EX* as documented, have to cast.
2011-07-07CHOP-753: uh, Microsoft docs lied about header file to use?Nat Goodspeed
Remove <kfuncs.h>, documented header file for GetCurrentProcess().
2011-07-07CHOP-753: add stats from GetProcessMemoryInfo() on Windows.Nat Goodspeed
Introduce StatsArray helper class to facilitate accumulating stats in the array-of-pair-arrays form cached internally by LLMemoryInfo.
2011-07-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-07-05CHOP-753: On Windows, add GetPerformanceInfo to LLMemoryInfo stats.Nat Goodspeed
So far we've only been querying GlobalMemoryStatusEx(), but GetPerformanceInfo() delivers a bunch more memory-related stats that may be pertinent. Try capturing those too. May not yet compile on Windows...
2011-07-06STORM-1262 FIXED Removed the original Windlight Region Settings implementation.Vadim ProductEngine
2011-07-05STORM-1330 WIP Removing a comment that was added by mistake.Vadim ProductEngine
2011-07-05STORM-1330 WIP Override region sun position when switching the region to ↵Vadim ProductEngine
fixed sky.
2011-07-05STORM-1330 WIP Switched the Terrain tab of the Region/Estate floater to ↵Vadim ProductEngine
using the region info model.
2011-07-01STORM-1137 FIXED Close the REGION/ESTATE floater when teleporting.Vadim ProductEngine
2011-07-01STORM-1464 FIXED Fixed inability to change terrain settings.Vadim ProductEngine
Reason: The "setregionterrain" message missed estate/region sun info and thus was incomplete. Fix: Added missing fields back. Note: The fields' values are fake.
2011-07-01STORM-1464 WIP Removed references to a nonexistent Apply button from the ↵Vadim ProductEngine
Region/Estate floater.
2011-07-01STORM-1470 FIXED Sky setting / Lighting preset position controls were ↵Vadim ProductEngine
inconsistent.
2011-06-30merge latest changes from viewer-developmentOz Linden
2011-06-30merge changes for shining branchOz Linden
2011-06-30merge changes for sec-906Oz Linden
2011-06-30merge changes for latest viewer-developmentOz Linden
2011-06-30mergeDave Parks
2011-06-30CHOP-753: Fix compile errors in LLMemoryInfo Windows-specific code.Nat Goodspeed
2011-06-30CHOP-753: Reduce redundancy in LLMemoryInfo.Nat Goodspeed
Recast stream() to display data from LLSD array rather than reinvoking OS operations used to capture it. Make refresh() cache LLSD data in map form as well as array; fetch items from that in a few places to avoid going back to OS.
2011-06-30STORM-1445 FIXED Added border line to Estate, Environment tabs in ↵Vadim ProductEngine
Region/Estate Floater.
2011-06-30CHOP-753: Fix errors in LLMemoryInfo Mac-specific code.Nat Goodspeed
Handle conversion errors (boost::bad_lexical_cast). Glean additional LLSD statistics from vm_stat output.
2011-06-30merge changes for storm-1452Oz Linden
2011-06-30merge changes for storm-1406Oz Linden
2011-06-30merge changes for storm-1327Oz Linden
2011-06-30merge changes for storm-1396Oz Linden
2011-06-30merge changes for storm-457Oz Linden
2011-06-29merge changes for storm-1423Oz Linden
2011-06-29merge changes for storm-1392Oz Linden
2011-06-29merge changes for storm-1368Oz Linden
2011-06-29CHOP-753: fix minor compilation errors on LinuxNat Goodspeed
2011-06-29CHOP-753: Introduce LLSD access to LLMemoryInfo ** BROKEN **Nat Goodspeed
This is known not to compile on Mac yet; checking in to concurrently work on Linux-specific code.
2011-06-30STORM-1305 WIP Edit Sky floater: removed the old sun position slider, added ↵Vadim ProductEngine
hour marks to the new one.
2011-06-29STORM-1305 WIP Edit Sky floater UI changes.Vadim ProductEngine
* Implemented new layout (made the floater smaller, moved widgets around). * Implemented new sun phase slider, bound to 24h time.
2011-06-29Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-06-29merge out latest viewer-developmentOz Linden
2011-06-29merge changes for storm-1302Oz Linden
2011-06-29merge changes for storm-1326Oz Linden
2011-06-29merge changes for storm-1292Oz Linden
2011-06-29storm-1454Oz Linden
2011-06-29merge changes for storm-1439Oz Linden
2011-06-29merge changes for storm-1352Oz Linden
2011-06-28CHOP-753: Report Linux memory stats 1/line, like other platforms.Nat Goodspeed
Previous code deliberately flowed the different lines from MEMINFO_FILE together on a single line, which seems pointless to me, since we want to be able to grep the viewer log to recognize individual stats. Also replace classic-C LLFILE* machinery used to read MEMINFO_FILE with std::ifstream and std::getline().