Commit Graph

23329 Commits (4718ffebc1942ea1d94c8e8d2eca071d0d834bc2)

Author SHA1 Message Date
eli 080c9faf5e FIX INTL-96 Viewer translation for Set31 2012-04-24 11:51:45 -07:00
eli 3d8d8b6dee sync with viewer-development 2012-04-24 11:40:57 -07:00
Oz Linden 9b87cfbc91 merge back tags for 3.3.1-release 2012-04-24 11:36:12 -04:00
Boroondas Gupte 1b832eaa4b OPEN-54: correct JsonCpp include path 2012-04-24 11:24:11 -04:00
Oz Linden d6569db352 Added tag viewer-release-candidate, 3.3.1-release for changeset c623bbc854b6 2012-04-24 08:38:38 -04:00
Nat Goodspeed 8c44511d2c IQA-463: Use newest APR package without apr_procattr_inherit_set(). 2012-04-23 14:50:32 -04:00
Nat Goodspeed 7079513c23 IQA-463: Add apr_file_open(APR_CREATE) flag for downloaded installer.
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-23 14:49:32 -04:00
callum 3cd9047233 Merge with head 2012-04-23 11:29:21 -07:00
callum 4ccae31320 SH-3115 FIX Crash on exit, curl handles not empty
Reviewed by Ted.
2012-04-23 11:28:52 -07:00
Nat Goodspeed 78816bb156 IQA-463: Use APR file I/O for downloaded viewer installer .exe.
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-23 12:01:15 -04:00
Brad Payne (Vir Linden) 1253c11e0b more phase tracking for inventory ops 2012-04-23 11:38:53 -04:00
Nat Goodspeed eb1bea2223 IQA-463: LLError::addRecorder() claims ownership of passed Recorder*.
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-23 11:26:18 -04:00
Adam Moss b6f2b2f399 remove a now-unused uniform. 2012-04-22 19:58:14 +01:00
Adam Moss 62f7777b7a and another! 2012-04-22 19:54:46 +01:00
Adam Moss 5adf6bdd28 remove a frightening llwarns that was just there for my own education. 2012-04-22 19:53:46 +01:00
Adam Moss ab82a96f6e STORM-1819: Ternary/graded shadow support
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-21 18:51:57 +01:00
Adam Moss 26df2b941e STORM-1819: Ternary/graded shadow support
cleanup: get rid of the no-op 'mex' function in the shaders which was being used as a dummy replacement for 'mix'
2012-04-21 18:42:47 +01:00
Adam Moss 442c5cf339 STORM-1819: Ternary/graded shadow support
a bunch of trivial clean-ups and commentary.
2012-04-21 18:33:07 +01:00
Adam Moss 03442801bd contributors.txt update. 2012-04-21 18:17:37 +01:00
Adam Moss 9ce481a5ac STORM-1819: Ternary/graded shadow support
Coalesced patchset.
2012-04-21 17:35:50 +01:00
Brad Payne (Vir Linden) 08704b36f6 startup phase tracking added to appearance metrics 2012-04-19 17:12:49 -04:00
Brad Payne (Vir Linden) 7fbf42dec8 Move phase tracking to its own set of classes inside LLViewerStats - simplifies llvoavatar and allows adding such tracking to classes that live outside the avatar lifetime 2012-04-19 14:52:44 -04:00
Nat Goodspeed 38e23bb0eb IQA-463: Make LLProcess call apr_procattr_inherit_set() extension.
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-18 15:43:34 -04:00
Nat Goodspeed 54228ddf50 IQA-463: Add error logging for certain LLFile operations.
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-18 15:34:15 -04:00
Oz Linden 19e0cc93a8 DRTVWR-139: merge back 3.3.1-beta2 fixes 2012-04-17 13:47:31 -07:00
Oz Linden ee1124e1c0 Added tag viewer-beta-candidate, 3.3.1-beta2, DRTVWR-139 for changeset 1dc545e44617 2012-04-17 13:42:53 -07:00
Seth ProductEngine c104c887c5 Mac build fix. 2012-04-17 17:36:22 +03:00
eli e627a5f8dd sync with viewer-development 2012-04-16 16:16:18 -07:00
callum 3ccda1f285 MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT request from similator and display a notification
Reviewed by Simon
2012-04-16 14:29:32 -07:00
Nat Goodspeed ee87fd975f DRTVWR-136: Remove redundant remove_(item|category)() functions.
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-14 22:23:24 -04:00
Oz Linden 11bbd7e10e gratuitous change to force new codeticket number 2012-04-14 08:19:07 -04:00
Oz Linden a56424d078 fix merge conflict in remove_item 2012-04-13 20:57:52 -04:00
Oz Linden f79b775fcc merge changes for drtvwr-136 2012-04-13 20:55:47 -04:00
Merov Linden adf5b5c1ef Final pull from viewer-thx1138 2012-04-13 17:20:53 -07:00
Merov Linden 8b3703bd03 SH-3060 : Always use old byte range on low res (faster), reserve new byte range for high res. 2012-04-13 15:42:54 -07:00
Seth ProductEngine 8d0c73dfd4 Touched a file to fix the TC build. 2012-04-14 00:54:59 +03:00
Oz Linden c7c7726c6f merge changes for drtvwr-135 2012-04-13 17:11:19 -04:00
Brad Payne (Vir Linden) 8778010fee fix for linux build failure 2012-04-13 17:03:29 -04:00
Merov Linden 7d8fdf9a85 SH-3080 : Fix wrong settings reading code (will crash on some machine) 2012-04-13 12:09:37 -07:00
Merov Linden 18fa5cd60b Pull from viewer-thx1138 2012-04-13 10:54:31 -07:00
Merov Linden b4a3bb4f3b SH-3081 : Implement TextureCameraMotion settings as well as faster loading when the camera is still 2012-04-12 22:05:53 -07:00
Merov Linden c410a4e332 SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter 2012-04-12 20:19:56 -07:00
Xiaohong Bao 0a42495906 for SH-3074: clear ghost and stale texture fetching requests in time 2012-04-12 15:50:25 -06:00
Seth ProductEngine dd012cc375 CHUI-87 FIXED crash in handling notifications after viewer disconnect.
Notification handlers now use LLHandles to screen channels.
2012-04-12 23:09:47 +03:00
Seth ProductEngine 7ef7bbef65 MAINT-891 FIXED Disabled focus return from modal dialog after viewer logoff.
Fixed boost trackable objects usage.
2012-04-12 23:09:32 +03:00
Brad Payne (Vir Linden) b4cf5c0c24 merge 2012-04-12 16:02:15 -04:00
callum ac50379957 SH-3065 FIX Investigate fixes for out-of-order operations on startup
Reviewed by Simon
2012-04-12 11:55:37 -07:00
Nat Goodspeed 7318e11571 Fix misleading comments, per Richard's code review. 2012-04-12 09:42:51 -04:00
Xiaohong Bao 3c0e4e4324 Automated merge with https://hg.lindenlab.com/merov/viewer-thx1138 2012-04-11 16:14:16 -06:00
Oz Linden 753e8673c3 merge changes for drtvwr-137 2012-04-11 16:23:31 -04:00