Logan Dethrow
f73b795bb7
Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to prevent ambiguous name build error.
2011-09-06 17:33:18 -04:00
Logan Dethrow
a8d49f7cf5
LLProxy code review fixes.
...
* Removed check_curl_code and check_curl_multi_code from the global namespace.
* Added comments documenting which thread the public methods of LLProxy should be called from.
* Corrected grammar in LLSingleton.h
* Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06 16:54:53 -04:00
Logan Dethrow
9a1e8d78fe
Merge
2011-09-01 17:06:15 -04:00
Logan Dethrow
342005cd92
Clarified the reason for adding the deleteSingleton method to LLSingleton. Added a simple unit test to verify the functionality of the deleteSingleton method.
2011-09-01 17:05:22 -04:00
Logan Dethrow
6ab0bc8789
LLProxy start of code review cleanup.
2011-09-01 16:44:04 -04:00
Oz Linden
e62a4d4ec1
merge changes for storm-1567
2011-08-31 09:07:32 -04:00
Oz Linden
cff59a6e5f
merge changes for storm-638
2011-08-31 09:06:50 -04:00
Oz Linden
af3f8f98f6
merge changes for storm-1566
2011-08-31 09:06:19 -04:00
Oz Linden
ee4fc00a27
merge changes for storm-1572
2011-08-31 09:05:49 -04:00
Oz Linden
3416cf0da8
merge changes for storm-1574
2011-08-31 09:05:06 -04:00
Oz Linden
a2c5944666
merge changes for storm-1522
2011-08-31 09:03:13 -04:00
Oz Linden
7f06179392
merge back beta tag changes
2011-08-31 09:00:05 -04:00
Oz Linden
f6505dc261
add missing contribution record
2011-08-31 08:59:20 -04:00
Jonathan Yap
36f9b513b0
STORM-1522 Region/Estate -> Terrain Text explaining Low and High values is truncated
2011-08-29 17:36:37 -04:00
Debi King (Dessie)
5a39c44b56
merged .hgtags
2011-08-29 12:23:28 -04:00
Debi King (Dessie)
f5a890453b
Added tag DRTVWR-86_3.0.2-beta2, 3.0.2-beta2 for changeset e5c9af2d7980
2011-08-29 12:12:40 -04:00
Oz Linden
bdd053abcf
increment viewer version to 3.0.4
2011-08-29 09:27:25 -04:00
Oz Linden
68a15f73c1
Added tag 3.0.3-start for changeset b95ddac176ac
2011-08-29 09:26:53 -04:00
Oz Linden
f42f7130f5
merge changes for .v-pb
2011-08-29 09:25:31 -04:00
Oz Linden
c34ab16ec1
merge tags back from viewer-beta
2011-08-29 09:23:59 -04:00
Oz Linden
c4d52b813b
merge tags from viewer-release
2011-08-29 09:21:47 -04:00
Debi King (Dessie)
b8b596a5fe
merged fix for EXP-1160 (STORM-1575)
2011-08-28 14:21:46 -04:00
Debi King (Dessie)
a5e0bbab4a
Added tag DRTVWR-83_3.0.2-beta1, 3.0.2-beta1 for changeset 42784bf50fa0
2011-08-28 14:17:02 -04:00
Debi King (Dessie)
e840660669
merged .hgtags from viewer-release
2011-08-28 14:14:58 -04:00
Debi King (Dessie)
3d2378f102
merge from viewer-pre-release
2011-08-28 10:43:02 -04:00
Debi King (Dessie)
f094d4f752
merge
2011-08-28 10:42:06 -04:00
Debi King (Dessie)
ebb55355eb
Added tag DRTVWR-78_3.0.0-release, 3.0.0-release for changeset 1778f26b6d0a
2011-08-28 10:41:31 -04:00
Vadim ProductEngine
d8be70e010
STORM-638 FOLLOWUP Fixed a silly pointer usage mistake.
2011-08-27 12:57:16 +03:00
Richard Nelson
5a6f07ab64
disabled basic inventory root creation
...
reviewed by Stone
2011-08-26 14:01:30 -07:00
Richard Nelson
863d9bdc50
EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a prim in latest Mesh build 239475
...
brought back some old logic for dispatching to child folder as drag and drop fallback
2011-08-26 12:57:16 -07:00
Jonathan Yap
b918ef5e6f
STORM-1574 Binary data in panel_login.xml -- filled up-pointing triangle.
2011-08-26 15:26:17 -04:00
Jonathan Yap
716e2bbce8
STORM-1567 Mute button for llDialog popup
...
Added comment where sidebar block list is opened.
2011-08-26 12:35:57 -04:00
Jonathan Yap
1f486a9515
STORM-1567 Mute button for llDialog popup
...
Made changes per RB feedback.
2011-08-26 12:11:57 -04:00
Vadim ProductEngine
dbfe3affa0
STORM-638 FIXED "Object Return" didn't return distant objects if the confirmation dialog wasn't suppressed.
...
Reason: Showing the confirmation dialog resets object selection,
thus there is nothing to derez.
Fix: Save selection until user answers in the confirmation dialog.
I didn't investigate why the bug occurred only for distant object
(must be some internal LLSelectMgr magic).
2011-08-26 18:29:52 +03:00
Oz Linden
d45995b80d
merge changes for storm-1568
2011-08-26 10:03:28 -04:00
Oz Linden
6f009080b9
merge changes for storm-1543
2011-08-26 10:02:23 -04:00
Vadim ProductEngine
a4f132f1b8
STORM-1543 WIP Removed invalid IOR_BUSY response option.
...
Addressing review feedback.
2011-08-26 00:19:33 +03:00
Oz Linden
4057afd291
merge changes for storm-1268
2011-08-25 13:27:52 -04:00
Oz Linden
7c222dfd13
merge changes for storm-1542
2011-08-25 13:25:04 -04:00
Oz Linden
f603d14339
merge changes for storm-1276
2011-08-25 13:24:48 -04:00
Oz Linden
e6239b7978
merge changes for storm-1571
2011-08-25 09:27:34 -04:00
Oz Linden
66cac05cfb
merge changes for storm-1570
2011-08-25 09:26:28 -04:00
Jonathan Yap
d254c7eb54
STORM-1572 XML issues for Basic/Advanced Mode button in menu bar
2011-08-24 18:13:38 -04:00
Nat Goodspeed
bf906ac926
Re-add 3 llinstancetracker tests disabled by changeset 1ead63777bf6.
...
Fix LLInstanceTracker::key_iter constructor param; accepting
InstanceMap::iterator by non-const reference relied on Microsoft extension
that accepts non-const reference to an rvalue. Given typical iterator
implementation, simply accept by value instead, which makes gcc happy too.
2011-08-24 09:08:42 -04:00
Aaron Stone
c7141025c8
Respect --no-verify-ssl-cert option.
2011-08-23 14:45:42 -07:00
Logan Dethrow
6484dbf28c
merge
2011-08-23 17:25:08 -04:00
Logan Dethrow
05e5ea243e
Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings Floater.
2011-08-23 17:06:38 -04:00
Jonathan Yap
541e26d947
STORM-1567 Mute button for llDialog popup
...
Updating patch to current version of viewer-development
2011-08-23 07:55:34 -04:00
Logan Dethrow
61f4c953c4
Fixed a xui widget name mismatch between c++ and xml.
2011-08-22 20:32:10 -04:00
Debi King (Dessie)
015cf59c96
merged .hgtags
2011-08-22 17:18:34 -04:00