685c98275c
merge
2011-07-12 17:31:37 -05:00
104748b59a
SH-1125 Retry when failing to get seed capability.
2011-07-12 17:31:25 -05:00
7f2ccaae7d
EXP-941 FIX Text and URL change to the Age Verification dialog
...
fixed some formatting
2011-07-12 15:23:46 -07:00
babeae1402
EXP-941 FIX Text and URL change to the Age Verification dialog
2011-07-12 15:12:54 -07:00
c45c603eee
Automated merge with http://hg.secondlife.com/mesh-development
2011-07-12 14:48:34 -06:00
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
905fb5f8d1
Save some CPU cycles by evaluating the product of 3 magic constants ourself
2011-07-12 22:28:29 +02:00
825e4a5399
FIX STORM-1494 remove duplicate ID and xml snippet
2011-07-12 12:22:07 -07:00
c37a986c9a
sync with viewer-development
2011-07-12 12:12:48 -07:00
5a767e4ceb
merge
2011-07-12 14:07:26 -05:00
bb44da4613
SH-2050 Hide UI that breaks down upload fee and rename some fields.
2011-07-12 14:07:09 -05:00
502f01bfef
Automated merge with http://hg.secondlife.com/mesh-development
2011-07-12 13:07:00 -06:00
43ddef4215
Added configurable option to remove objects from minimap if the are above or below a certain level of the avatar
2011-07-12 20:49:42 +02:00
18cce53c4c
merge
2011-07-12 14:46:04 -04:00
496c81401d
SH-2049 FIX
2011-07-12 14:39:15 -04:00
77e2be7984
SH-2043 FIX
2011-07-12 14:35:32 -04:00
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
8a28549694
merge
2011-07-12 13:22:38 -05:00
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
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
ec0ee4f7c8
SH-2052 Fix for reported PE being too low when selecting more than 500 objects.
2011-07-12 12:04:58 -05:00
04cf64c43b
Nullpointer check for region debug panel
2011-07-12 18:38:32 +02:00
ac28f59c9e
Experimental fix/patch for FIRE-1574 - Cursor displacement in notecards should be greatly reduced now.
2011-07-12 16:41:53 +02:00
18e8d57b21
EXP-995 FIX -- New icon scrolls into Received Items panel heading
...
EXP-903 FIX -- Newness/Freshness number does not decrease as items are opened in Inbox
* Brought back freshness with the freshness
* New badge and label color from Gibson
* Inventory Panel now allows display of badges with proper clipping
Reviewed by Richard.
2011-07-11 17:45:29 -07:00
b8351e83e8
fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"
2011-07-11 17:51:16 -06:00
f587af0af1
Build fix for Mac OS X.
2011-07-11 15:16:56 -07:00
a148d0a150
Increased chat/toast fade time to 60 seconds. Fixes FIRE-1977
2011-07-11 23:39:45 +02:00
475af30ded
Fixed tooltip description
2011-07-11 23:25:25 +02:00
452a352504
Fixed initial value attribute on beam colors floater
2011-07-11 23:12:48 +02:00
070c3aae51
Added user-defined restart delay on estate tools. Fixes FIRE-1073
2011-07-11 23:07:27 +02:00
44c7c6feaa
merge changes for storm-1315
2011-07-11 16:52:00 -04:00
121d004b32
merge changes for storm-1459
2011-07-11 16:51:06 -04:00
7b9fc42941
merge changes for storm-1325
2011-07-11 16:49:29 -04:00
8fc1335894
Automated merge with https://bitbucket.org/squire_linden/viewer-development-crash-horde
2011-07-11 14:23:33 -06:00
35ae78a96c
more fix for STORM-1468: [crashhunters] pre-login crash at 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-11 14:17:57 -06:00
90ceac118c
more fix for STORM-1468: [crashhunters] pre-login crash at 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-11 14:17:57 -06:00
4b3ed516fc
Fix for sh-1982 and sh-2025
2011-07-11 14:55:07 -04:00
8fcda650a7
CHOP-753: Add classic-C-style diagnostics around popen("vm_stat").
...
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-11 14:24:28 -04:00
b905b231c9
merge
2011-07-11 13:52:46 -04:00
572a1734a5
SH-2012: removed upload wizard from inventory '+' menu
2011-07-11 13:51:20 -04:00
9db49b4448
SH-2038 Disable usage of stream vbo on mac and make flexi's use stream vbo if stream vbo disabled (effectively disables usage of vertex buffers for flexible objects on mac)
2011-07-11 12:14:06 -05:00
e104aad66a
Add option to enable look at targets in preferences (Firestorm -> General). Fixes FIRE-2056
2011-07-11 18:55:14 +02:00
b5149a63f9
SH-2038 Compatibility fix for mac build (GL_ARB_sync symbols not defined on OSX)
2011-07-11 11:41:34 -05:00
80e60371f8
Fix for linux build failure, hopefully
2011-07-11 11:33:05 -04:00
607f60d6f6
CHOP-753: Add timestamp to LLMemoryInfo's LLSD stats block.
...
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-11 10:57:14 -04:00
05711a6e94
Fixed hilarious German translation fault in group hovertip
2011-07-11 16:21:35 +02:00
436f2beafd
Show L$ transactions in nearby chat. Fixes FIRE-1470
2011-07-11 15:55:35 +02:00
c94bc42892
increment viewer version to 2.8.1
2011-07-11 08:44:19 -04:00
1927214e66
Added tag 2.8.0-start for changeset e1ed60913230
2011-07-11 08:43:23 -04:00
8529c37dee
merge changes for storm-1488
2011-07-11 06:16:19 -04:00
Dave Parks