summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2011-06-30MergeLogan Dethrow
2011-06-29merge changes for storm-1368Oz Linden
2011-06-28STORM-1112 More cleanup of SOCKS 5 proxy code.Logan Dethrow
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-27STORM-1446 Portability fix when setting non-blocking socket options.Aaron Stone
2011-06-22Merge, fixed build issues by refactoring SOCKS 5 code.Logan Dethrow
2011-06-21MergeLogan Dethrow
2011-06-21Refactored SOCKS 5 handshake to use existing LLSocket class.Logan Dethrow
2011-06-21Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-20fix for SH-1870: can not upload book_collection_1.dae when include texturesXiaohong Bao
2011-06-20ER-944: Add feature to control user sounds on a parcel. Added new checkboxessimon@lindenlab.com
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-16Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com
2011-06-14mergeBrad Payne (Vir Linden)
2011-06-10STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden ↵Logan Dethrow
Coding Standard and comments in the code review.
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name ↵Dave SIMmONs
change to "hidden avatars"
2011-06-08Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and ↵Logan Dethrow
socks5.h.
2011-06-03automated mergeRoxie Linden
2011-05-27transplant fix for SH-1467Roxie Linden
viewer now uses simulatorfeatures to check whether to show UI elements for mesh or not
2011-05-24Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-23CHOP-661: Add information to try to zero in on remaining failures.Nat Goodspeed
Make testrunner.py module interpret $INTEGRATION_TEST_VERBOSE environment variable, setting module global VERBOSE. Enable/disable debug() output based on that variable, defaulting to VERBOSE True. Add debug() output to freeport(), including reporting exceptions. Add debug() output to test_llsdmessage_peer.py, including normal BaseHTTPRequestHandler output: when VERBOSE is set, don't suppress log_request() or log_error() output. Add C++ verbose() function to query $INTEGRATION_TEST_VERBOSE, broken out as two functions so we only have to interpret the value once. Default to 'true'. Move C++ commtest_data::getport(variable) function to global namespace, broken out as two functions to cache the value. Report value received when verbose() returns true.
2011-05-18fix for SH-1591: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138Xiaohong Bao
2011-05-16Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-16mergeDave Parks
2011-05-12mergeDave Parks
2011-05-12Merge lindenlab/viewer-developmentDave SIMmONs
2011-05-10CHOP-661: add and use code to listen on next available server port.Nat Goodspeed
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-04EXP-772 -- Log in failure, keeps saying DNS cannot resolve hostname.Leslie Linden
No real progress on this Jira yet but Mac build was not properly reporting the CURL error string. This check-in fixes that. So far, I have backed out URL related changes between 2.6.2 and 2.6.3 without any change in behavior. Unsure how to proceed next although comparing libcares and libcurl builds between 2.6.2 and 2.6.3 seems like it could be the next logical step. Users experiencing the problem can go back to vewere 2.6.2 or adjust DNS settings to use the google free DNS servers 8.8.8.8 and 8.8.4.4 which should allow them to work around the problem. Reviewed by Richard.
2011-05-02ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by ↵Dave SIMmONs
Kelly
2011-05-02mergeDave Parks
2011-05-02merge changes for storm-380Oz Linden
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
missed else case
2011-04-28STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Richard Linden
fixed crash on startup
2011-04-22STORM-380 FIXED Added syncing animations and sounds before the gesture ↵Seth ProductEngine
starts playing. The actual playing of animations and sounds of a gesture starts only when all needed animations and sound files are loaded into viewer cache. This reduces the delay between animations and sounds meant to be played simultaneously but may increase the delay between the moment a gesture is triggered and the moment it starts playing. Fixed calling assets callback to clean up the void pointer in getAssetData() and avoid potential memory leaks.
2011-04-15STORM-1039 FIXED Bad iterator access in llavatarnamecache.cpp:564Paul ProductEngine
- Replaced 'while' loop by 'for' - Deleted unnecessary 'cur' iterator
2011-04-04fix a crash inherited from viewer-developmentXiaohong Bao
2011-04-01VWR-25376 Enable compression for GET and POST for Inventory and other ↵Aaron Stone
capabilities.
2011-04-01pull latest changes from viewer-developmentOz Linden
2011-04-01VWR-24487 make PREHASH variables char const* constBoroondas Gupte
2011-03-28VWR-20801 Implement SOCKS 5 Proxy for the viewerRobin Cornelius
2011-03-11sync up to latest viewer-developmentOz Linden
2011-04-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-03-03Autobuild : Fix llsdmessage integration test failure on MacMerov Linden
2011-02-28Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-25Fix llhost integration test: replaced linux.org by lindenlab.com in the DNS ↵Merov Linden
lookup test as linux.org was not being resolved as expected
2011-02-24pull latest changes from viewer-vs2010Oz Linden
2011-02-23MergeXiaohong Bao
2011-02-23Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-22update vstool to support vs2010.Alain Linden
2011-02-21change host reverse lookup test to use our own host (linux.org failed)Oz Linden
2011-02-18Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-17merge up from viewer-autobuildOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 19:08:04 +0000