summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-04-27fix some flaws for SH-3104Xiaohong Bao
2012-04-27Pull merge from drano-sh-3086Merov Linden
2012-04-26SH-3104 : Implemented HTTP bulk fetch for texture debug consoleMerov Linden
2012-04-26a fix for SH-3097Xiaohong Bao
2012-04-26for SH-3097: introducing texel pixel ration adjustmentXiaohong Bao
2012-04-26For SH-3121: collect time of reloading all textures from cache and through ↵Xiaohong Bao
HTTP when all objects loading are done.
2012-04-26merge changes for drtvwr-140Oz Linden
2012-04-26Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2012-04-26tracking for copy-to-wear inventory failuresBrad Payne (Vir Linden)
2012-04-25merge changes for wolf-318Oz Linden
2012-04-25for subtasks SH-3118, SH-3112, SH-3110, SH-3106, SH-3091 for SH-3086:Xiaohong Bao
As a viewer architect, I would like to understand how fast each of the components of the texture pipeline can run in isolation
2012-04-26MAINT-813 FIXED crash when trying to access the region info after viewer ↵Seth ProductEngine
disconnect. Added checks for LLViewerRegion pointer in LLViewerObject being invalid.
2012-04-25Try to suppress spurious Mac ld warnings (lib/release/Release dir).Nat Goodspeed
Mindful that some autobuild packages populate only packages/lib/release (rather than packages/lib/debug), Linking.cmake always appends packages/lib/release to CMake's link_directories() directive. But since CMake always appends CMAKE_BUILD_TYPE to those directories, we end up with a phantom packages/lib/release/Release directory on the search path. This would be harmless except that the Mac's 'ld' command produces a warning. These warnings quickly make TC's "Important Messages" output useless. Try appending packages/lib/release only when the build type isn't already Release.
2012-04-25WOLF-318: change default verbosity of some unit tests to keep them out of ↵Oz Linden
the logs when passing WOLF-363: (partial) correct ordering of cleaning build dir vs running 'autobuild install'
2012-04-24FIX INTL-96 Viewer translation for Set31eli
2012-04-24sync with viewer-developmenteli
2012-04-24OPEN-54: correct JsonCpp include pathBoroondas Gupte
2012-04-23IQA-463: Add apr_file_open(APR_CREATE) flag for downloaded installer.Nat Goodspeed
This handles the case when the target file doesn't exist, just as APR_TRUNCATE handles the case when it does. Strengthen error checks concerning downloaded installer file from ll_apr_warn_status() to ll_apr_assert_status(). Failing to recognize (e.g.) failure to open that file only leads to mysterious crashes down the road; this removes the mystery.
2012-04-23Merge with headcallum
2012-04-23SH-3115 FIX Crash on exit, curl handles not emptycallum
Reviewed by Ted.
2012-04-23IQA-463: Use APR file I/O for downloaded viewer installer .exe.Nat Goodspeed
On Windows, calling CreateProcess(bInheritHandles=FALSE) is the wrong idea. In that case, CreateProcess() passes NO handles -- even the files you've explicitly designated as the child's stdin, stdout, stderr in the STARTUPINFO struct! Remove LLProcess code to tweak bInheritHandles; we should also remove the corresponding (useless) APR extension. Instead, given that the Windows file-locking problem we've observed is specific to the viewer installer .exe file downloaded by the background updater logic, use APR file I/O for that specific file. Empirically, both llofstream and std::ofstream seem to make the open file handle inheritable; but apr_file_open() documentation says: "By default, the returned file descriptor will not be inherited by child processes created by apr_proc_create()." And indeed, it does appear to sidestep the locking problem.
2012-04-23more phase tracking for inventory opsBrad Payne (Vir Linden)
2012-04-23IQA-463: LLError::addRecorder() claims ownership of passed Recorder*.Nat Goodspeed
That is, when the underlying LLError::Settings object is destroyed -- possibly at termination, possibly on LLError::restoreSettings() -- the passed Recorder* is deleted. There was much existing code that seemed as unaware of this alarming fact as I was myself. Passing to addRecorder() a pointer to a stack object, or to a member of some other object, is just Bad. It might be preferable to make addRecorder() accept std::auto_ptr<Recorder> to make the ownership transfer more explicit -- or even boost::shared_ptr<Recorder> instead, which would allow the caller to either forget or retain the passed Recorder. This preliminary pass retains the Recorder* dumb pointer API, but documents the ownership issue, and eliminates known instances of passing pointers to anything but a standalone heap Recorder subclass object.
2012-04-22remove a now-unused uniform.Adam Moss
2012-04-22and another!Adam Moss
2012-04-22remove a frightening llwarns that was just there for my own education.Adam Moss
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
missed a few spots: cleanup: get rid of the no-op 'mex' function in the shaders which was being used as a dummy replacement for 'mix'
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
cleanup: get rid of the no-op 'mex' function in the shaders which was being used as a dummy replacement for 'mix'
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
a bunch of trivial clean-ups and commentary.
2012-04-21STORM-1819: Ternary/graded shadow supportAdam Moss
Coalesced patchset.
2012-04-19startup phase tracking added to appearance metricsBrad Payne (Vir Linden)
2012-04-19Move phase tracking to its own set of classes inside LLViewerStats - ↵Brad Payne (Vir Linden)
simplifies llvoavatar and allows adding such tracking to classes that live outside the avatar lifetime
2012-04-18IQA-463: Make LLProcess call apr_procattr_inherit_set() extension.Nat Goodspeed
On Windows, Bad Things happen when apr_proc_create() is allowed to pass TRUE to CreateProcess(bInheritHandles). For instance, the open handle for a new installer executable file being downloaded by the background updater gets inadvertently passed to a couple slplugin.exe instances. When the viewer finishes downloading, closes the file and tries to remove it, Windows balks because the file is still open by another process. Require an apr_suite package that includes the new Linden apr_procattr_inherit_set() extension, and call it to turn off CreateProcess(bInheritHandles).
2012-04-18IQA-463: Add error logging for certain LLFile operations.Nat Goodspeed
Attempting to debug an observed LLFile::remove() failure, I was floored to find that remove() made no attempt whatsoever to report its lack of success! Add warnif() function to log errno text in platform-dependent way. Support the notion that for some functions, certain errno values are acceptable -- e.g. we expect stat() to frequently hit ENOENT -- and need not be logged. Add commented-out Windows-specific logic to try to provide further information in the case of EACCES ("Permission denied," e.g. another process has the file open). To use, enable the code block, download handle.exe and turn on DEBUG logging for LLFile. handle.exe can be obtained from: http://technet.microsoft.com/en-us/sysinternals/bb896655
2012-04-17DRTVWR-139: merge back 3.3.1-beta2 fixesOz Linden
2012-04-17Mac build fix.Seth ProductEngine
2012-04-16sync with viewer-developmenteli
2012-04-16MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT ↵callum
request from similator and display a notification Reviewed by Simon
2012-04-14DRTVWR-136: Remove redundant remove_(item|category)() functions.Nat Goodspeed
Incoming changes from two different project repos left viewer-development with LLInventoryModel::removeItem() and removeCategory() plus free functions remove_item() and remove_category() in llinventoryfunctions.cpp. remove_category() was actually the better implementation; migrated its body into LLInventoryModel::removeCategory(). Clearly the previous state of affairs -- with LLInventoryModel::removeItem() plus a remove_category() free function in a very different source file -- fooled two different developers into overlooking the other of the pair. Unfortunately we each added different "missing" functions, leaving us with a complete set of four. Fix existing references to remove_item() and remove_category() free functions.
2012-04-13fix merge conflict in remove_itemOz Linden
2012-04-13merge changes for drtvwr-136Oz Linden
2012-04-13Final pull from viewer-thx1138Merov Linden
2012-04-13SH-3060 : Always use old byte range on low res (faster), reserve new byte ↵Merov Linden
range for high res.
2012-04-14Touched a file to fix the TC build.Seth ProductEngine
2012-04-13merge changes for drtvwr-135Oz Linden
2012-04-13fix for linux build failureBrad Payne (Vir Linden)
2012-04-13SH-3080 : Fix wrong settings reading code (will crash on some machine)Merov Linden
2012-04-13Pull from viewer-thx1138Merov Linden
2012-04-12SH-3081 : Implement TextureCameraMotion settings as well as faster loading ↵Merov Linden
when the camera is still
2012-04-12SH-3080 : Implement the TextureReverseByteRange setting so we can play with ↵Merov Linden
that parameter