summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-05-16Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-16remove new search in favor of moving to a project viewerOz Linden
2011-05-15storm-1249 and chop-661Oz Linden
2011-05-13Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-05-13Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-13ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. ↵Dave SIMmONs
Reviewed by Kelly.
2011-05-13EXP-783 User can accept a call and see end call option in IM window but they ↵Leyla Farazha
are in nearby voice
2011-05-12EXP-818 FIX Use different settings to control search url for beta channel ↵Richard Linden
viewers
2011-05-12Merge lindenlab/viewer-developmentDave SIMmONs
2011-05-12Automated merge with ↵Richard Linden
bundle:F:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.7nrmxq\ssh__richard@hg.lindenlab.com_richard_viewer-experience_gittck.hg
2011-05-12EXP-802 fixing voice chat enabled persistenceLeyla Farazha
2011-05-12Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-05-12STORM-1243 WIP Fixed a typo in notifications.xml which might lead to ↵Vadim ProductEngine
numerous notification handling errors. The typo was introduced in changeset 437f3d892bfd.
2011-05-13merge changes for storm-1247Oz Linden
2011-05-13merge changes to improve build timesOz Linden
2011-05-13merge changes for vwr-24197Oz Linden
2011-05-12WIP VWR-23688 adding es and pt missing translation; add 1 zh file for ↵Eli Linden
testing Traditional Chinese as a new language
2011-05-12sync up with viewer-developmentEli Linden
2011-05-12Merge.brad kittenbrink
2011-05-12merge changes for storm-477Oz Linden
2011-05-11mergeLeyla Farazha
2011-05-11EXP-783 User can accept a call and see end call option in IM window but they ↵Leyla Farazha
are in nearby voice
2011-05-11EXP-760 Selecting No Device for output and input in Sound Devices in Basic ↵Leyla Farazha
mode still results in voice having input and output - also 2 default options
2011-05-11yOz Linden
2011-05-11merge changes for storm-1236Oz Linden
2011-05-11merge changes for storm-1209Oz Linden
2011-05-11EXP-813 FIX Login screen reloads when clicking on location slappRichard Linden
2011-05-11EXP-809 FIX Make Script Warning/Error window scrolling behavior match that ↵Richard Linden
of Chat history
2011-05-11STORM-477 Restored the backed out changeset: b62b260aa04dSeth ProductEngine
2011-05-11STORM-477 Restored the backed out changeset: c9cc202293b7Seth ProductEngine
2011-05-10EXP-806 FIX Server-side messages without a corresponding notification should ↵Richard Linden
show original, untranslated content
2011-05-10merge changes for beta fixesOz Linden
2011-05-10MergeXiaohong Bao
2011-05-10STORM-1209 FIX Object continued sending messages after user adding this ↵Vadim ProductEngine
object to block list. Applying Joshua's fix.
2011-05-10ER-480 Viewer work for abandoned land.Kelly Washington
* Support group members with the right powers buying land set for sale to a group * Add dialogs for abandoned land related notifications.
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-09EXP-776 WIP [crashhunters] crash in LLCloudLayer::decompressRichard Linden
EXP-777 WIP [crashhunters] crash in LLWind::decompress added NULL check
2011-05-09EXP-801 FIX Linden Research Inc text is clipped on login page in Basic modecallum
(Reverted change back to original behavior - needs attention later)
2011-05-09mergeLeyla Farazha
2011-05-09EXP-802 Add a check box to enable/disable voice chat.Leyla Farazha
2011-05-09Automated merge with ↵Richard Linden
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-09Merge.brad kittenbrink
2011-05-09Clean up parcel privacy icons and locationsDave SIMmONs
2011-05-09increment viewer version to 2.6.9Oz Linden
2011-05-07EXP-664 : following richard codereview: use llclamp where appropriateMerov Linden
2011-05-07Merge with viewer-experienceMerov Linden
2011-05-07Pull from viewer-experience-mergeMerov Linden
2011-05-07storm-1237: merge experience team issuesOz Linden
2011-05-07merge changes for storm-1231Oz Linden
2011-05-07merge changes for i18nOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 05:35:00 +0000