Commit Graph

18785 Commits (06e18dd44dcd7fa4ea6af89d329ca4e0a8c350cb)

Author SHA1 Message Date
Xiaohong Bao 2a61d908e7 Merge 2011-05-10 13:57:41 -06:00
Vadim ProductEngine 4440526a8e STORM-1209 FIX Object continued sending messages after user adding this object to block list.
Applying Joshua's fix.
2011-05-10 18:58:40 +03:00
Kelly Washington 56e471c399 ER-480 Viewer work for abandoned land.
* Support group members with the right powers buying land set for sale to a group
* Add dialogs for abandoned land related notifications.
2011-05-10 08:40:00 -07:00
Nat Goodspeed 8e8eb76eb9 CHOP-661: add and use code to listen on next available server port.
In indra/llmessage/tests/testrunner.py, introduce new freeport() function to
try a caller-specified expression (such as instantiating an object that will
listen on a server port) with a range of candidate port numbers until the
expression produces a value instead of EADDRINUSE exception.
Change test_llsdmessage_peer.py and test_llxmlrpc_peer.py to use freeport() to
construct their server class inline BEFORE launching the thread that will run
it, then pass that server's serve_forever method to daemon thread. Also set
os.environ["PORT"] to selected environment variable before running subject
test program.
In indra/llmessage/tests/commtest.h, introduce commtest_data::getport() to
read port number from specified environment variable, throwing exception if
variable not set or non-numeric. Construct default LLHost from getport("PORT")
instead of hardcoded constant.
Change indra/newview/tests/llxmlrpclistener_test.cpp to use commtest_data::
getport("PORT") instead of hardcoded constant. Also use LLSD::with() rather
than older LLSD::insert() syntax.
HOWEVER -- I am irritated to discover that llxmlrpclistener_test IS NOT RUN or
even built by newview/CMakeLists.txt! It's not even commented out -- it's
entirely deleted! I am determined to restore this test. However, as it will
take some fiddling with new link-time dependencies, that will be a separate
commit.
2011-05-10 08:21:21 -04:00
Richard Linden 6428924827 EXP-776 WIP [crashhunters] crash in LLCloudLayer::decompress
EXP-777 WIP [crashhunters] crash in LLWind::decompress
added NULL check
2011-05-09 17:24:56 -07:00
callum 604f92fa20 EXP-801 FIX Linden Research Inc text is clipped on login page in Basic mode
(Reverted change back to original behavior - needs attention later)
2011-05-09 17:10:26 -07:00
Xiaohong Bao 5f6559c0f6 Automated merge with http://hg.secondlife.com/mesh-development 2011-05-09 16:45:47 -06:00
Xiaohong Bao dab6d7b507 fix for SH-Render Metadata Physics Shapes on Development Client Gives Black Screen 2011-05-09 16:41:00 -06:00
Leyla Farazha 91956a0f44 merge 2011-05-09 15:23:53 -07:00
Debi King (Dessie) bfae60d082 merged .hgtags 2011-05-09 18:22:23 -04:00
Debi King (Dessie) 1f26ff1b42 Added tag 2.6.8-start for changeset 5e349dbe9cc8 2011-05-09 18:19:16 -04:00
Leyla Farazha 3039663148 EXP-802 Add a check box to enable/disable voice chat. 2011-05-09 15:10:56 -07:00
Debi King (Dessie) 265d363a0f Added tag DRTVWR-52_2.6.6-beta1, 2.6.6-beta1 for changeset bb1075286b3b 2011-05-09 18:07:01 -04:00
Debi King (Dessie) 77c39cef52 merged .hgtags from viewer-pre-beta 2011-05-09 18:00:23 -04:00
Loren Shih 6078021744 SH-1343 Change wizard slider labels
Changed "Performance" and "Accuracy" to "Higher Performance" and "Higher Accuracy" on physics page.
2011-05-09 18:00:10 -04:00
Brad Payne (Vir Linden) 49cadf47f3 SH-1491 WIP - whole model upload for fee request 2011-05-09 17:30:40 -04:00
Brad Payne (Vir Linden) 0b677dd219 SH-1491 WIP - whole model upload for fee request 2011-05-09 16:56:29 -04:00
Richard Linden e1f2b2b3e8 Automated merge with bundle:F:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.4vsiw5\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_qwnptv.hg 2011-05-09 11:55:47 -07:00
brad kittenbrink 2661a4c2c9 Merge. 2011-05-09 11:26:24 -07:00
Xiaohong Bao 847b709c27 fix for SH-1530: Viewer crash in LLSurface::getWaterHeight 2011-05-09 12:18:04 -06:00
Dave Parks fac4ca594f SH-1517 Always build bounding hull from highest LoD. 2011-05-09 12:56:28 -05:00
Loren Shih 155d96000f SH-1444 "Allow mesh objects" setting is visible on a non-mesh region. 2011-05-09 13:50:07 -04:00
Loren Shih 781af27e9c SH-1419 Sim complains about changing physical materials when Physics, Temporary, or Phantom is changed. 2011-05-09 13:49:20 -04:00
Brad Payne (Vir Linden) 369b34443d SH-1491 WIP - whole model upload for fee request 2011-05-09 11:23:15 -04:00
Oz Linden a5118ccd67 increment viewer version to 2.6.9 2011-05-09 09:57:02 -04:00
Oz Linden 078250ff5f Added tag 2.6.8-start for changeset 5e349dbe9cc8 2011-05-09 09:56:20 -04:00
Merov Linden 1e0d3fc7bc EXP-664 : following richard codereview: use llclamp where appropriate 2011-05-07 11:09:34 -07:00
Merov Linden 460aa3ade7 Merge with viewer-experience 2011-05-07 11:01:58 -07:00
Merov Linden 51c779b5e8 Pull from viewer-experience-merge 2011-05-07 10:54:32 -07:00
Oz Linden 510283ce83 storm-1237: merge experience team issues 2011-05-07 10:11:40 -04:00
Oz Linden a941a37627 merge changes for storm-1231 2011-05-07 06:57:58 -04:00
Oz Linden 8b5ebe59ca merge changes for i18n 2011-05-07 06:56:42 -04:00
Oz Linden 8cdf32aa12 merge changes for storm-1093 2011-05-07 06:53:28 -04:00
Jonathan Yap 86180db1f1 STORM-1236 snapshot: Please resize the text box or modify the text so that it fits. 2011-05-06 20:58:48 -04:00
Eli Linden 5544c18466 WIP VWR-24160 en_xui_change accommodate longest string 2011-05-06 17:54:58 -07:00
Eli Linden bb781cbef7 FIX VWR-23696 remove old parameter overrides 2011-05-06 17:27:50 -07:00
Eli Linden e0849adec7 WIP VWR-23688 2011-05-06 16:29:40 -07:00
Dave Parks c5fd41b232 merge 2011-05-06 17:48:24 -05:00
Eli Linden 099d1795e5 FIX VWR-23615 en_xui_change es it resizing 2011-05-06 15:34:01 -07:00
brad kittenbrink 26334a4c57 Automated merge with ssh://bitbucket.org/brad_linden/viewer-mustbuildfaster-0 2011-05-06 14:53:30 -07:00
brad kittenbrink 4888db6f9c Continuing work on CHOP-609 build time improvements. Fixed eroneous additional_INCLUDE_DIRS setting for unit tests. 2011-05-06 14:51:50 -07:00
Dave Parks 75cb9fde7d Automated merge with https://bitbucket.org/davep/mesh-candidate-storm-1210 2011-05-06 16:39:17 -05:00
Dave Parks 8a029d235e SH-1521 Potential fix for shadows not working on mac. 2011-05-06 16:39:07 -05:00
Leyla Farazha e068e81f9f merge 2011-05-06 14:27:24 -07:00
callum d892256d5b Merge with head 2011-05-06 13:40:13 -07:00
callum 4ad94507dd EXP-623 (SUPPLEMENTAL FIX) Selecting fly option while on click to walk path
flys avatar to end point but avatar spins and shakes when arriving at click point.
2011-05-06 13:39:27 -07:00
Leyla Farazha 483ceba5f4 EXP-769: "Group call requests received in Basic mode"
fixing merge error
2011-05-06 13:36:08 -07:00
Logan Dethrow 39ad3f1d88 merge 2011-05-06 15:25:12 -04:00
Logan Dethrow 5c7a906b44 Increased the viewer cache size limit to 10GB. Increased the default to 1GB.
* Changed the hard coded cache limit in llappviewer.cpp to 10GB as well as the
   slider maximum in the preferences menu. * The VFS cache is capped at 1GB due
   to file system limitations. The former 80/20 split between texture/vfs is
   maintained up to 5GB. Above this limit the texture cache is given all
   the additional cache space up to 10GB.
 * Fixed a log message in lltexturecache.cpp that was not showing the correct
   texture size. ER-883
 * Fixed a bug in llfloaterpreference.cpp that caused new cache value to be
   written to the old cache setting. This resulted in the the cache not being
   cleared when the location was set back to the default. ER-882
 * Disabled the "The cache will be cleared on reboot" message that is triggered
   by the reset button in the cache preferences in the case where the cache
   is already located in the default location.  The cache is only cleared when
   its location is changed. This is intended to address resident confusion
   regarding the purpose of the reset button, as demonstrated in VWR-19562.
2011-05-06 15:15:17 -04:00
Dave Parks 57c8e9893e Automated merge with https://bitbucket.org/davep/mesh-candidate-storm-1210 2011-05-06 13:40:12 -05:00