Commit Graph

20135 Commits (ed734e2a18b1c5e66dcafe5b4bd3991e0252acb7)

Author SHA1 Message Date
eli 030b24188a sync with viewer-development 2011-07-18 11:09:58 -07:00
Dave Parks 2eaadf9024 SH-2031 Fix for shadow render targets using inappropriate shader for occlusion culling resulting in objects popping in and out of the shadow map. 2011-07-18 12:22:54 -05:00
Oz Linden e1eb7a26af merge changes for storm-1510 2011-07-18 12:14:57 -04:00
Debi King (Dessie) 5f3194be1d reconciled .hgtags 2011-07-18 12:08:01 -04:00
Debi King (Dessie) 67e365ba57 Added tag DRTVWR-71_2.8.0-beta1, 2.8.0-beta1 for changeset e1ed60913230 2011-07-18 11:46:24 -04:00
Dave Parks 190ff3c346 SH-2031 Fix for link error in llui_libtest 2011-07-18 10:39:02 -05:00
Oz Linden 50d271a2ae increment viewer version to 2.8.2 2011-07-18 08:31:32 -04:00
Oz Linden 771ff8a764 Added tag 2.8.1-start for changeset 502f6a5deca9 2011-07-18 08:30:42 -04:00
Oz Linden ec2d528952 re-enable the watchdog 2011-07-18 08:30:21 -04:00
Nat Goodspeed 9077f7722b Decided against using Boost.Filesystem, remove from link 2011-07-17 09:51:29 -04:00
Dave Parks 6469f1c2f2 SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available. 2011-07-17 00:24:08 -05:00
Nat Goodspeed 790032d231 Use raw-string syntax for other Windows pathnames inserted to Python. 2011-07-16 22:24:31 -04:00
Nat Goodspeed 81dc440128 Use raw-string syntax for Python string containing Windows pathname.
Consider this pathname for llsdserialize_test.cpp:
C:\nats\indra\llcommon\tests\llsdserialize_test.cpp
Embed that in a Python string literal:
'C:\nats\indra\llcommon\tests\llsdserialize_test.cpp'
and you get a string containing:
C:
ats\indra\llcommon	ests\llsdserialize_test.cpp
where the \n became a newline and the \t became a tab character.
Hopefully Python raw-string syntax r'C:\etc\etc' works better.
2011-07-16 10:20:41 -04:00
Oz Linden 2f49b60ddc merge changes for storm-1482 2011-07-16 08:05:26 -04:00
Oz Linden ae805d511d merge late release changes and tags 2011-07-16 08:04:49 -04:00
Oz Linden 94adbe81af pull back late beta fix 2011-07-16 08:03:22 -04:00
jenn 1b7316c7e4 Automated merge with https://bitbucket.org/lindenlab/viewer-development 2011-07-16 05:53:34 +00:00
Nat Goodspeed 2b509383cc Use C++ __FILE__ rather than Python __file__ to find indra work area.
In this case, the Python code in question is being written from a C++ string
literal to a temp script file in a platform-dependent temp directory -- so the
Python __file__ value tells you nothing about the location of the repository
checkout. Embedding __FILE__ from the containing C++ source file works better.
2011-07-15 22:32:06 -04:00
jenn 077bb8b39e Automated merge with https://bitbucket.org/lindenlab/viewer-development 2011-07-15 23:39:17 +00:00
jenn 86a806137b After review and testing, realized that 'WatchdogEnabled' is actually true to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value.
Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15 23:26:19 +00:00
Aaron Stone 14a06fd1c8 Merge for STORM-1482 2011-07-15 16:26:15 -07:00
Roxie Linden f8ad1412c1 automated merge 2011-07-15 16:25:38 -07:00
Aaron Stone 5f99d30c20 STORM-1482 Always run the crash loggers, they will check what to do and how to clean up. 2011-07-15 16:25:32 -07:00
Nat Goodspeed 15c36ee9b3 If we're going to need indra.base.llsd, have to munge sys.path.
And at that point, the Python logic needed to bring in the llsd module is big
enough to warrant capturing it in a separate string variable common to
multiple tests.
2011-07-15 17:20:27 -04:00
Oz Linden dba72d2565 storm-1510: update to new login display url 2011-07-15 17:10:36 -04:00
Nat Goodspeed e41c4c90f0 Not all TC agents have llbase.llsd, fall back to indra.base.llsd 2011-07-15 16:01:43 -04:00
Roxie Linden b88c7166f4 STORM-1355 Memory issues from UI for very large groups
This change is not guaranteed to fix this issue as the issue
is difficult to repro, but there was a sketchy case

group member responses come back from the simulator in message
packets.  For very large numbers of members, there may be a
large number of packets received.  The member data is placed
in a structure of type LLGroupMgrGroupData, based on the group
id.

The problem is, if the user refreshes the group before the entire
contents of the previous request comes back, response packets from
the previous request will be intermingled with the responses from
the refresh.

Both the request call and the response handler would create the
group data structure, if the structure wasn't already there.  There
may be a case where a response from the previous request causes
creation of the group data, populating it with the contents of the
response, and the responses from the second request would use that
group data structure.

Also, cleaned up some comments and variable names to be consistent
2011-07-15 12:53:09 -07:00
Aaron Stone a517d32c48 STORM-1482 Change the defaults, look in the app_settings dir for configs as well. 2011-07-15 12:46:06 -07:00
Nat Goodspeed fee07bb597 Try again to pacify VS fatal warning. 2011-07-15 14:24:37 -04:00
Nat Goodspeed 4b21954729 Muzzle VS warning 2011-07-15 14:02:45 -04:00
Oz Linden fc5aaf5df8 merge changes for storm-1509 2011-07-15 13:20:49 -04:00
Nat Goodspeed 7341e01ce2 Add test to verify Python-to-C++ LLSD notation sequence.
Verify that an LLSD::String containing newlines works; verify that newlines
between items are accepted.
2011-07-15 12:42:49 -04:00
Vadim ProductEngine 187844d5fc STORM-1506 FIXED Reset the estate to global sun when changing region environment settings.
By the way, moved estate info storage from the REGION/ESTATE floater to a model class.
2011-07-15 19:15:30 +03:00
Nat Goodspeed c33cf379f2 Add test to verify C++-to-Python LLSD notation sequence.
Write a sequence of LLSDSerialize::toNotation() calls separated by newlines to
a data file, then read lines and parse using llbase.llsd.parse(). Verify that
this produces expected data even when one item is a string containing newlines.
Generalize python() helper function to allow using any of the NamedTempFile
constructor forms.
Allow specifying expected Python rc (default 0) and use this to verify an
intentional sys.exit(17). This is better than previous sys.exit(0) test
because when, at one point, NamedTempFile failed to write file data, running
Python on an empty script file still terminates with rc 0. A nonzero rc
verifies that we've written the file, that Python is running it and that we're
retrieving its rc.
2011-07-15 11:53:05 -04:00
Nat Goodspeed e3b5d9fc5c Change NamedTempScript to NamedTempFile; allow streaming to it.
The only thing about NamedTempScript that was specific to script files was the
hardcoded ".py" extension. Renaming it to NamedTempFile with an explicit
extension argument addresses that.
Allow constructing NamedTempFile with either a std::string, as before, or an
expression of the form (lambda::_1 << some << stuff). If Linden's Boost
package included the Boost.Iostreams lib, we could even stream such an
expression directly to an ostream constructed around the fd. But oh well.
2011-07-15 10:48:46 -04:00
Richard Linden 1dfa63e73e Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-07-14 20:58:04 -07:00
Richard Linden 7dd8dc8be6 EXP-880 FIX Enable navigation chrome in search floater
fixed regression where profile window wasn't using requested size
2011-07-14 20:57:32 -07:00
Don Kjer fde88ae24d Potential fix for SH-1854 and SH-1125 (caps issues) 2011-07-14 18:43:49 -07:00
Nat Goodspeed 1f58cd688f Pacify Linux gcc more thoroughly. 2011-07-14 20:20:35 -04:00
Nat Goodspeed 9f66409b88 #include correct headers for Windows _open() et al.
Also mollify Linux build, which gets alarmed when you implicitly ignore
write()'s return value. Ignore it explicitly.
2011-07-14 19:39:32 -04:00
Nat Goodspeed 5f37ec3c71 Avoid Boost.Filesystem: Boost package improperly built on Windows?
Seems Linden's Boost package and the viewer build might use different
settings of the /Zc:wchar_t switch.
Anyway, this implementation using open(O_CREAT | O_EXCL) should be more
robust. I'm surprised Boost.Filesystem doesn't seem to offer "create a unique
file"; all I found was "generate a random filename fairly likely to be unique."
2011-07-14 19:07:13 -04:00
eli 143db44c9a FIX STORM-1494 remove duplicate ID and xml snippet 2011-07-14 15:23:23 -07:00
Leyla Farazha 892ca49503 EXP-1001 Newness is removed on next login if you log out or crash before opening inventory panel
EXP-1002 Single order purchase does not open Received Items panel by default if Inventory panel open when delivered
2011-07-14 15:05:07 -07:00
Nat Goodspeed 8ca0f872f2 wstring_to_utf8str() accepts LLWString rather than std::wstring. 2011-07-14 17:12:02 -04:00
Seth ProductEngine aad5943ab0 STORM-1234 FIXED text editor selection which was skipping the last character in line.
Added handling of the wrapped lines case when calculating the starting position for selection.

The bug is a regression caused by the fix of STORM-320 which was dealing with calculating the position of the input cursor while navigating through the lines of text with word wrapping enabled.
2011-07-14 23:46:27 +03:00
Nat Goodspeed 624c3f1a8e Use Linden wstring-to-string conversion, not boost::filesystem's.
On Windows, calling boost::filesystem::path::string() implicitly requests
code conversion between std::wstring (the boost::filesystem::path::string_type
selected on Windows) and std::string. At least for integration-test program,
that produces link errors. Use Linden's wstring_to_utf8str() instead.
2011-07-14 16:24:31 -04:00
Aaron Stone f3dd16ac47 STORM-1482 Little bit of Windows crash report value logging. 2011-07-14 12:38:24 -07:00
Leyla Farazha c4c0a057c2 turning on newness 2011-07-14 12:27:55 -07:00
Nat Goodspeed 24508cc924 Attempt to fix minor build errors on Windows. 2011-07-14 15:27:36 -04:00
Leyla Farazha 6a3f806883 merge 2011-07-14 12:14:07 -07:00