Logan Dethrow
|
05e5ea243e
|
Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings Floater.
|
2011-08-23 17:06:38 -04:00 |
|
Logan Dethrow
|
61f4c953c4
|
Fixed a xui widget name mismatch between c++ and xml.
|
2011-08-22 20:32:10 -04:00 |
|
Logan Dethrow
|
ce0b04889d
|
Merge.
|
2011-08-18 17:52:00 -04:00 |
|
Logan Dethrow
|
4fb809eed5
|
Backed out revision cbc793dcd3db to disable libcurl verbose logging.
|
2011-08-18 16:10:49 -04:00 |
|
Logan Dethrow
|
d79eedcfc3
|
LLProxy: Renamed a setting to better describe what it controls.
|
2011-08-18 16:07:33 -04:00 |
|
Oz Linden
|
b2ef0f9988
|
merge changes for storm-1546
|
2011-08-17 11:32:27 -04:00 |
|
Oz Linden
|
ff2eb602a0
|
merge changes for storm-1560
|
2011-08-17 11:31:06 -04:00 |
|
Oz Linden
|
559172d34d
|
merge changes for release tags
|
2011-08-17 11:29:23 -04:00 |
|
eli
|
8843e4384e
|
FIX INTL-66 translation for set26 and basic set5, for 6 languages
|
2011-08-16 18:13:34 -07:00 |
|
Oz Linden
|
c067f4ba7a
|
merge back late beta fixes
|
2011-08-16 19:09:53 -04:00 |
|
Logan Dethrow
|
797b4df42a
|
Backed out changeset 694594710de2
|
2011-08-16 17:35:16 -04:00 |
|
eli
|
cf40a8307f
|
sync with viewer-development
|
2011-08-16 12:32:12 -07:00 |
|
Oz Linden
|
1278223f36
|
merge missing changesets for storm-1557
|
2011-08-16 14:45:03 -04:00 |
|
Debi King (Dessie)
|
8379df21bc
|
merged .hgtags
|
2011-08-16 13:49:35 -04:00 |
|
Debi King (Dessie)
|
f99cf295e1
|
Added tag DRTVWR-74_2.8.3-release, 2.8.3-release for changeset fb85792b84bf
|
2011-08-16 13:45:13 -04:00 |
|
Oz Linden
|
637e6e66d3
|
remove map file used to convert old internal repositories to this one
|
2011-08-16 12:42:06 -04:00 |
|
Logan Dethrow
|
61a7a874aa
|
Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.
|
2011-08-15 20:05:28 -04:00 |
|
Oz Linden
|
cb957d3dab
|
merge late 3.0.1 beta candidate fixes
|
2011-08-15 16:35:41 -04:00 |
|
Oz Linden
|
7819b49086
|
correct tabs for coding policy conformance
|
2011-08-15 16:28:03 -04:00 |
|
Oz Linden
|
b8320207bb
|
merge changes for storm-1557
|
2011-08-15 16:22:03 -04:00 |
|
Richard Nelson
|
72ffcd147a
|
EXP-1081 FIX add search auth token as cookie instead of query param
fixed search url
|
2011-08-15 11:12:51 -07:00 |
|
Richard Nelson
|
dc8944ac49
|
EXP-1081 FIX add search auth token as cookie instead of query param
moved all parameters other than search query to base64 encoded llsd
|
2011-08-15 11:10:00 -07:00 |
|
Logan Dethrow
|
ff870e9770
|
Back out later: Turned on curl verbose logging for debugging purposes.
|
2011-08-15 13:22:23 -04:00 |
|
Logan Dethrow
|
3743ec176c
|
LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was already being called.
|
2011-08-15 13:21:33 -04:00 |
|
Debi King (Dessie)
|
45036820f8
|
merged .hgtags
|
2011-08-15 12:21:59 -04:00 |
|
Debi King (Dessie)
|
91eb63bdde
|
Added tag DRTVWR-78_3.0.0-beta1, 3.0.0-beta1 for changeset b0be6ce3adfe
|
2011-08-15 11:50:05 -04:00 |
|
Oz Linden
|
b21e63cc12
|
increment viewer version to 3.0.1
|
2011-08-15 10:36:13 -04:00 |
|
Oz Linden
|
0bee6c278c
|
Added tag 3.0.1-start for changeset 82a2079ffcb5
|
2011-08-15 10:35:23 -04:00 |
|
Oz Linden
|
efd4137839
|
merge changes for storm-632
|
2011-08-15 09:44:42 -04:00 |
|
Oz Linden
|
91ac6b16f5
|
merge changes for VWR-25588
|
2011-08-15 09:43:38 -04:00 |
|
Logan Dethrow
|
f73ec6a037
|
merge
|
2011-08-12 14:24:00 -04:00 |
|
Logan Dethrow
|
cff5251f06
|
LLProxy: xui string cleanup.
|
2011-08-12 14:23:43 -04:00 |
|
Oz Linden
|
a2dc2317a6
|
pull back late fix from viewer-pre-release for storm-1553
|
2011-08-12 09:47:48 -04:00 |
|
Vadim ProductEngine
|
ba129fff47
|
STORM-632 ADDITIONAL_FIX Use non-greedy regexp match to enable multiple <nolink>...</nolink> clauses in a single textbox.
|
2011-08-12 16:32:47 +03:00 |
|
Vadim ProductEngine
|
0742a29850
|
STORM-1553 FIXED Removing remnants of an unfinished merge from settings.xml.
|
2011-08-12 14:48:49 +03:00 |
|
Oz Linden
|
a41e149642
|
merge back release tags
|
2011-08-11 20:51:23 -04:00 |
|
Richard Linden
|
25f1653ca0
|
EXP-1080 FIX Console gets spammed with VertexShaderEnable messages making the viewer unusable
converted LL_WARNS to LL_WARNS_ONCE
|
2011-08-11 14:21:20 -07:00 |
|
Richard Linden
|
3b8acd4f41
|
EXP-1079 FIX User is not logged out immediately inworld when selecting to change modes and restart while logged in
used requestQuit instead of forceQuit
|
2011-08-11 14:17:28 -07:00 |
|
Debi King (Dessie)
|
dc6c486dea
|
reconciled .hgtags
|
2011-08-11 17:11:57 -04:00 |
|
Debi King (Dessie)
|
25d23fcbeb
|
Added tag DRTVWR-76_2.8.1-hotfix, 2.8.1-hotfix for changeset 4780e3bd2b30
|
2011-08-11 17:07:31 -04:00 |
|
Debi King (Dessie)
|
b31046e852
|
Added tag DRTVWR-72_2.8.1-release, 2.8.1-release for changeset 29e93d7e1999
|
2011-08-11 17:06:18 -04:00 |
|
Oz Linden
|
3d8e99d4fb
|
merge back late beta fix for storm-1060
|
2011-08-11 16:38:31 -04:00 |
|
Oz Linden
|
f452138f29
|
merge changes for storm-1427
|
2011-08-11 16:31:19 -04:00 |
|
Oz Linden
|
3e47d9aea9
|
merge changes for storm-632
|
2011-08-11 16:30:55 -04:00 |
|
Oz Linden
|
4c0565f381
|
merge changes for STORM-1534
|
2011-08-11 16:30:15 -04:00 |
|
Richard Linden
|
b215c724c1
|
Automated merge with http://hg.secondlife.com/viewer-development
|
2011-08-11 10:11:59 -07:00 |
|
Richard Linden
|
9a9e78740a
|
Automated merge with file:///e:\code\viewer-experience
|
2011-08-11 10:09:28 -07:00 |
|
Oz Linden
|
0294a7c0e5
|
update default value for Lindens list
|
2011-08-11 09:33:38 -04:00 |
|
Richard Nelson
|
8b09dfb890
|
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
|
2011-08-10 23:44:58 -07:00 |
|
Richard Nelson
|
2c15d7d690
|
EXP-1028 FIX Move mode switching to logged in UI
forgot a file
|
2011-08-10 23:44:26 -07:00 |