61a7a874aa
Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.
2011-08-15 20:05:28 -04:00
ff870e9770
Back out later: Turned on curl verbose logging for debugging purposes.
2011-08-15 13:22:23 -04:00
3743ec176c
LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was already being called.
2011-08-15 13:21:33 -04:00
f73ec6a037
merge
2011-08-12 14:24:00 -04:00
cff5251f06
LLProxy: xui string cleanup.
2011-08-12 14:23:43 -04:00
a41e149642
merge back release tags
2011-08-11 20:51:23 -04:00
dc6c486dea
reconciled .hgtags
2011-08-11 17:11:57 -04:00
25d23fcbeb
Added tag DRTVWR-76_2.8.1-hotfix, 2.8.1-hotfix for changeset 4780e3bd2b30
2011-08-11 17:07:31 -04:00
b31046e852
Added tag DRTVWR-72_2.8.1-release, 2.8.1-release for changeset 29e93d7e1999
2011-08-11 17:06:18 -04:00
3d8e99d4fb
merge back late beta fix for storm-1060
2011-08-11 16:38:31 -04:00
f452138f29
merge changes for storm-1427
2011-08-11 16:31:19 -04:00
3e47d9aea9
merge changes for storm-632
2011-08-11 16:30:55 -04:00
4c0565f381
merge changes for STORM-1534
2011-08-11 16:30:15 -04:00
0294a7c0e5
update default value for Lindens list
2011-08-11 09:33:38 -04:00
2ba175befd
convert linden names list to string
2011-08-10 15:50:04 -04:00
1bf7869b0b
storm-1060: yet another attempt to fix windows icons
2011-08-10 09:15:29 -04:00
8d9394a409
storm-1549
2011-08-09 20:49:37 -04:00
008d95535f
EXP-880 FIX Disable address bar copy menu and open in external browser button
...
when using trusted browser or explicitly disabling address bar
2011-08-09 13:32:46 -07:00
c7b6a25728
merge late beta fixes for storm-1060
2011-08-09 13:47:19 -04:00
608403a846
merge changes for vwr-26458
2011-08-09 10:22:04 -04:00
fc0166380b
merge changes for storm-1473
2011-08-09 10:21:07 -04:00
4ff281ab94
merge changes for storm-1436
2011-08-09 10:20:41 -04:00
f8c6283f4c
merge changes for storm-1309
2011-08-09 10:20:20 -04:00
554159416f
merge changes for storm-1540
2011-08-09 10:19:45 -04:00
4405c74f71
merge changes for storm-1194
2011-08-09 10:19:21 -04:00
53efce5b5a
merge changes for storm-1186
2011-08-09 10:18:43 -04:00
f8a2b67649
merge changes for storm-1060
2011-08-08 23:23:58 -04:00
881a215535
more idiosyncracies for beta channel
2011-08-08 23:23:34 -04:00
1fa2afbe20
merge
2011-08-08 18:09:11 -04:00
1d0575bcc4
merge beta fix for storm-1060
2011-08-08 16:52:08 -04:00
ad0fcbc45c
merge
2011-08-08 23:49:14 +03:00
f7e5282bad
fix idiosyncratic name for beta viewer channel icon recognition
2011-08-08 16:49:06 -04:00
f695f8d112
STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as Web links in the ShareItemsConfirmation notification.
...
Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
2011-08-08 23:46:23 +03:00
fe14e50a45
Fixed numerous comment spelling errors in llerror.cpp and llerror.h
2011-08-08 16:19:39 -04:00
5915da89f0
LLProxy cleanup.
...
Made the socks proxy start first in llstartup.cpp
Moved initialization of the proxy to before the HTTP table fetch
Added Doxygen comments to LLProxy methods.
Removed call to applyProxySettings in llxmlrpctransaction.cpp since the ctor of LLCurlEasyRequest will apply the proxy settings.
2011-08-08 15:53:06 -04:00
4ab5831b3e
increment viewer version to 3.0.1
2011-08-08 11:13:15 -04:00
1722790ab6
Added tag 3.0.0-start for changeset 6b678ea52f90
2011-08-08 11:08:53 -04:00
8053f7a5b0
correct xml syntax error
2011-08-08 11:08:33 -04:00
7c7038136e
correct version number typo
2011-08-08 10:58:52 -04:00
f30680cce9
correct merge-induced error in settings.xml
2011-08-08 10:56:32 -04:00
09dc3fd81b
merge back beta tags
2011-08-08 10:08:22 -04:00
33fa30f526
merge back release tag
2011-08-08 10:06:12 -04:00
fb2733942c
increment viewer version to 3.0.0
2011-08-08 09:16:01 -04:00
0d085e90ac
merge changes for storm-1060
2011-08-08 09:14:36 -04:00
8c5da0552d
merged .hgtags
2011-08-05 19:09:28 -04:00
8675901fa8
Added tag DRTVWR-75_2.8.3-beta1, 2.8.3-beta1 for changeset 599677276b22
2011-08-05 19:07:06 -04:00
1ccb5f855c
add reading Linden names at build time from enviroment-specified file
2011-08-05 18:35:30 -04:00
ba475c35eb
STORM-1427 FIXED Fixed a debug assertion triggered in the world map floater.
...
Apparently, passing empty region name to the MapNameRequest makes server return
empty name in MapBlockReply, which triggered the assertion.
2011-08-05 23:31:10 +03:00
d456006f9a
remove override for channel testing
2011-08-05 16:23:31 -04:00
38e18cd69c
undo Mac app name change (again)
2011-08-05 13:28:29 -04:00
Logan Dethrow