Nat Goodspeed
4c465f496f
Eliminate use of PATH_MAX, which is bogus anyway.
2011-07-14 15:08:25 -04:00
Oz Linden
54bb91fd03
merge changes for 2.7.5 release
2011-07-14 14:47:15 -04:00
Debi King (Dessie)
dc0765fc3d
Added tag DRTVWR-66_2.7.4-release, 2.7.4-release for changeset 057f319dd8ec
2011-07-14 11:17:28 -07:00
Nat Goodspeed
3ddaf95c5c
New llsdserialize_test logic needs Boost.Filesystem library.
...
That, in turn, needs Boost.System library.
2011-07-14 14:01:45 -04:00
Nat Goodspeed
0ab0efc327
Work around broken Windows command-line processing.
...
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-14 14:00:12 -04:00
Leyla Farazha
e17c7e6d24
EXP-899 No user feedback given when a user attempts to delete a system folder from their inventory
2011-07-14 10:58:11 -07:00
Leyla Farazha
aa9564953b
EXP-998 Logging in with different user can remove newness for incorrect user
2011-07-14 10:57:23 -07:00
Dave Parks
ddbd5cee74
merge
2011-07-14 01:32:31 -05:00
Dave Parks
4e61870f3a
merge
2011-07-14 01:07:26 -05:00
Dave Parks
561d40d5c3
SH-715 Disable simplify/analyze button while counterpart is executing.
2011-07-14 01:07:01 -05:00
Richard Linden
d668270c13
EXP-880 FIX Enable navigation chrome in search floater
...
fixed regression where preferred content size was no longer being respected
2011-07-13 18:24:48 -07:00
Richard Linden
38ba526cc5
EXP-1009 WIP Teleport links from Search floater and destination guide in viewer fail with intrusted browser error in viewer
2011-07-13 17:59:53 -07:00
Nat Goodspeed
ec780a733f
Still trying to fix Windows header-file-order problem.
2011-07-13 19:41:23 -04:00
Richard Linden
42c6949e30
EXP-941 FIX text and url change to the age verification dialog
...
tweaked url
2011-07-13 16:06:31 -07:00
Nat Goodspeed
beea7cdc2d
Attempt to fix confusing header-file-order problems on Windows.
2011-07-13 19:03:28 -04:00
Oz Linden
4d432251e4
merge changes for storm-1507
2011-07-13 17:45:06 -04:00
Oz Linden
1f369cad59
merge changes for open-99
2011-07-13 17:43:45 -04:00
Nat Goodspeed
0f66566620
Introduce support for C++ integration tests running Python scripts.
...
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-13 17:36:59 -04:00
Oz Linden
21bacab562
merge changes for eli_viewer-development
2011-07-13 15:19:34 -04:00
Brad Payne (Vir Linden)
dd3069127b
merge
2011-07-13 14:57:23 -04:00
Leslie Linden
ce45e5542a
Disabled the fresh item count. The badge on the suitcase button now once again
...
reflects the total item count in the Received Items folder and the New badge is
no longer initialized and will not be displayed.
Reviewed by Richard.
2011-07-13 11:48:09 -07:00
Brad Payne (Vir Linden)
a6a0d5dda7
SH-1637 FIX, SH-1638 FIX - fixes jittery camera problems
2011-07-13 13:55:04 -04:00
Paul ProductEngine
f783c335f0
STORM-1503 FIXED Find floater doesn't set focus to its browser.
...
Added tab stop for browser to get focus when find floater is focused.
2011-07-13 18:55:08 +03:00
Vadim ProductEngine
b1473d4b6b
STORM-1502 FIXED Disable "Delete Water/Sky/Day Preset" dialogs if no user presets exist.
2011-07-13 12:02:03 +03:00
Richard Linden
fa3f4d1166
EXP-880 FIX Enable navigation chrome for Search floater
...
search floater derives from floater_web_content
all web content now uses floater_web_content instead of media_browser
2011-07-12 20:58:30 -07:00
Don Kjer
40a489a9cc
Merge
2011-07-12 18:10:44 -07:00
Don Kjer
4e16dc26ab
Changes to support SH-1894: Textures uploaded with Mesh do not appear in inventory. Reviewed by Andrew
2011-07-12 18:10:17 -07:00
jenn
f015c073cd
Watchdog timeout now set to 60 seconds for long-term use (instead of 20, used during crash pile-on).
...
Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
2011-07-13 00:16:43 +00:00
Nat Goodspeed
ed648b1f08
CHOP-753: Eliminate redundant array-of-pair-arrays in LLMemoryInfo.
...
(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-12 20:14:39 -04:00
Aaron Stone
450b64981c
Merge for STORM-1482
2011-07-12 15:52:14 -07:00
Aaron Stone
42daa3497b
STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some 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-12 15:48:02 -07:00
Dave Parks
685c98275c
merge
2011-07-12 17:31:37 -05:00
Dave Parks
104748b59a
SH-1125 Retry when failing to get seed capability.
2011-07-12 17:31:25 -05:00
Richard Linden
7f2ccaae7d
EXP-941 FIX Text and URL change to the Age Verification dialog
...
fixed some formatting
2011-07-12 15:23:46 -07:00
Richard Linden
babeae1402
EXP-941 FIX Text and URL change to the Age Verification dialog
2011-07-12 15:12:54 -07:00
Xiaohong Bao
c45c603eee
Automated merge with http://hg.secondlife.com/mesh-development
2011-07-12 14:48:34 -06:00
Xiaohong Bao
5d25338ed0
fix for SH-2040: Missing '?: 0' and old style object/prim counts under Edit linked when Mesh disabled
2011-07-12 14:42:56 -06:00
eli_linden
825e4a5399
FIX STORM-1494 remove duplicate ID and xml snippet
2011-07-12 12:22:07 -07:00
eli_linden
c37a986c9a
sync with viewer-development
2011-07-12 12:12:48 -07:00
Dave Parks
5a767e4ceb
merge
2011-07-12 14:07:26 -05:00
Dave Parks
bb44da4613
SH-2050 Hide UI that breaks down upload fee and rename some fields.
2011-07-12 14:07:09 -05:00
Xiaohong Bao
502f01bfef
Automated merge with http://hg.secondlife.com/mesh-development
2011-07-12 13:07:00 -06:00
Brad Payne (Vir Linden)
18cce53c4c
merge
2011-07-12 14:46:04 -04:00
Brad Payne (Vir Linden)
496c81401d
SH-2049 FIX
2011-07-12 14:39:15 -04:00
Brad Payne (Vir Linden)
77e2be7984
SH-2043 FIX
2011-07-12 14:35:32 -04:00
Nat Goodspeed
e58a0e9b26
CHOP-753: Defend against boost::regex exceptions.
...
(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-12 14:34:31 -04:00
Dave Parks
8a28549694
merge
2011-07-12 13:22:38 -05:00
Dave Parks
922bc0aa6a
SH-2053 Don't poke the UI from a background thread -- it tends to get crashy.
2011-07-12 13:22:01 -05:00
Nat Goodspeed
4e23550363
CHOP-753: make getAvailableMemoryKB() only load data on Windows.
...
(per Monty code review)
Other platforms return -1 anyway, so don't need to call load methods.
2011-07-12 13:34:09 -04:00
Dave Parks
ec0ee4f7c8
SH-2052 Fix for reported PE being too low when selecting more than 500 objects.
2011-07-12 12:04:58 -05:00