113f532ee5
Added tag 2.6.9-start for changeset e67da2c6e312
2011-05-16 14:57:22 -04:00
92426cce0c
remove new search in favor of moving to a project viewer
2011-05-16 14:57:15 -04:00
6ddd79be06
Added tag 2.6.9-start for changeset 11d5d8080e67
2011-05-16 14:55:34 -04:00
0b5f662c3b
storm-1249 and chop-661
2011-05-15 12:51:47 -04:00
1e6d1879a0
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-13 17:02:49 -07:00
039b6baf06
EXP-783 User can accept a call and see end call option in IM window but they are in nearby voice
2011-05-13 11:01:36 -07:00
166e4df278
EXP-818 FIX Use different settings to control search url for beta channel viewers
2011-05-12 18:42:44 -07:00
4e02747908
Automated merge with 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-12 13:20:09 -07:00
506646b4d0
EXP-802 fixing voice chat enabled persistence
2011-05-12 11:45:09 -07:00
e18f200243
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-12 11:38:32 -07:00
e8ede07451
STORM-1243 WIP Fixed a typo in notifications.xml which might lead to numerous notification handling errors.
...
The typo was introduced in changeset 437f3d892bfd.
2011-05-12 21:17:10 +03:00
5c9ecbcc24
merge changes for storm-1247
2011-05-13 08:48:11 -04:00
8f7a6f8312
merge changes to improve build times
2011-05-13 08:47:24 -04:00
0859d38e95
merge changes for vwr-24197
2011-05-13 08:46:08 -04:00
22e2cee6c0
WIP VWR-23688 adding es and pt missing translation; add 1 zh file for testing Traditional Chinese as a new language
2011-05-12 18:17:35 -07:00
174bdbf65c
sync up with viewer-development
2011-05-12 18:06:54 -07:00
f7a01d7b33
Merge.
2011-05-12 17:08:20 -07:00
e881042125
merge changes for storm-477
2011-05-12 10:35:05 -04:00
524345ab0e
merge
2011-05-11 17:54:00 -07:00
9364f995b5
EXP-783 User can accept a call and see end call option in IM window but they are in nearby voice
2011-05-11 17:52:05 -07:00
c83eff097e
EXP-760 Selecting No Device for output and input in Sound Devices in Basic mode still results in voice having input and output - also 2 default options
2011-05-11 17:46:51 -07:00
6fcf9e4817
add missed contribution credit for Ima Mechanique
2011-05-11 20:08:25 -04:00
ba568b8945
y
2011-05-11 20:07:36 -04:00
5ffde6fa6d
merge changes for storm-1236
2011-05-11 20:06:05 -04:00
09bdefabc6
merge changes for storm-1209
2011-05-11 20:05:22 -04:00
a0267151c3
EXP-813 FIX Login screen reloads when clicking on location slapp
2011-05-11 16:43:42 -07:00
05697cdf29
merge changes for storm-1241
2011-05-11 19:17:34 -04:00
ebc65ada21
null merge of transplant for storm-1241
2011-05-11 19:15:09 -04:00
9dbc3301f6
EXP-809 FIX Make Script Warning/Error window scrolling behavior match that of Chat history
2011-05-11 13:14:48 -07:00
e213a36f70
STORM-477 Restored the backed out changeset: b62b260aa04d
2011-05-11 18:12:23 +03:00
662bc0803c
STORM-477 Restored the backed out changeset: c9cc202293b7
2011-05-11 18:12:48 +03:00
7be1755d61
merge changes for VWR-25727
2011-05-11 08:39:54 -04:00
c9becd55bd
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00
32bce75124
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00
f1c4c9d237
EXP-806 FIX Server-side messages without a corresponding notification should show original, untranslated content
2011-05-10 17:11:05 -07:00
d86eb3dd42
merge changes for beta fixes
2011-05-10 17:46:32 -04:00
2a61d908e7
Merge
2011-05-10 13:57:41 -06:00
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
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
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
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
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
91956a0f44
merge
2011-05-09 15:23:53 -07:00
bfae60d082
merged .hgtags
2011-05-09 18:22:23 -04:00
1f26ff1b42
Added tag 2.6.8-start for changeset 5e349dbe9cc8
2011-05-09 18:19:16 -04:00
3039663148
EXP-802 Add a check box to enable/disable voice chat.
2011-05-09 15:10:56 -07:00
265d363a0f
Added tag DRTVWR-52_2.6.6-beta1, 2.6.6-beta1 for changeset bb1075286b3b
2011-05-09 18:07:01 -04:00
77c39cef52
merged .hgtags from viewer-pre-beta
2011-05-09 18:00:23 -04:00
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
2661a4c2c9
Merge.
2011-05-09 11:26:24 -07:00
Oz Linden