Commit Graph

20642 Commits (7d6ea9814e51d818c176dfd5ed9a3ffc0a1737d1)

Author SHA1 Message Date
simon@Simon-PC.lindenlab.com 7d6ea9814e ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewed
by Kelly
2011-09-27 09:32:36 -07:00
Oz Linden d475a96e94 merge changes for storm-1621 2011-09-23 14:33:32 -04:00
eli da4fccdb7c INTL-74 FIX translation for 6 languages for Set27 and Basic Set6 2011-09-22 18:20:07 -07:00
eli 94943e2c82 sync with viewer-development 2011-09-22 18:08:17 -07:00
Oz Linden 627bd3c5b9 merge changes for storm-1607 2011-09-22 08:52:21 -04:00
eli d63ba05e1d sync with viewer-development 2011-09-21 15:43:00 -07:00
Oz Linden 4c25b7398b merge changes for storm-1616 2011-09-21 18:08:33 -04:00
Oz Linden 7d7d0e696a STORM-1616: Change default initial mode to Advanced 2011-09-21 18:01:44 -04:00
Brad Payne (Vir Linden) 2091ce3ae7 SH-2472 FIX - avoid accessing nonexistent texture entries in lineSegmentItersect 2011-09-21 16:25:34 -04:00
Debi King (Dessie) 8665dee5f6 reconciled .hgtags 2011-09-21 16:04:12 -04:00
Debi King (Dessie) a66b5fb8cf reconciled .hgtags 2011-09-21 16:01:11 -04:00
Debi King (Dessie) fdf1ee0dd8 merge 2011-09-21 15:56:49 -04:00
Debi King (Dessie) a001a63a45 Added tag DRTVWR-84_3.0.3-release, 3.0.3-release for changeset 0496d2f74043 2011-09-21 15:53:13 -04:00
Oz Linden f8442cef72 increment viewer version to 3.0.6 2011-09-21 15:31:39 -04:00
Oz Linden 2ae5e8db53 Added tag 3.0.5-start for changeset 92a3aa047754 2011-09-21 15:29:22 -04:00
Roxie Linden 5bdfc97152 VWR-26942: Nederland CA was causing issues when it was mid-CA.pem, moved to end for testing. We are still investigating the real issue, but this may be a sufficient patch 2011-09-21 15:28:45 -04:00
Oz Linden 1b5937c06b merge changes for storm-1618 2011-09-21 13:49:32 -04:00
Brad Payne (Vir Linden) 0d9e46ab0b SH-2432 FIX - moved status line to lower part of dialog 2011-09-21 11:16:26 -04:00
Dave Parks 83732a7083 SH-2445 Potential fix for crash in LLCurl::Multi::~Multi -- lock sMultiMutex around curl_multi_ calls in LLCurl::Multi destructor 2011-09-19 16:39:16 -05:00
Oz Linden e85ae35ff9 merge changes for storm-1608 2011-09-19 16:59:01 -04:00
Oz Linden 1911586ce4 storm-1610 2011-09-19 16:58:21 -04:00
Oz Linden 9ac33479aa merge changes for storm-1609 2011-09-19 16:57:20 -04:00
Oz Linden aa45b6e480 VWR-26942: back out 6a0e0684e7af 2011-09-19 14:48:19 -04:00
prep linden 6350d8eb4b merge 2011-09-19 11:00:34 -04:00
prep linden 3f0a2cda29 Fix for sh-2443 2011-09-19 11:00:11 -04:00
Brad Payne (Vir Linden) 187a39885c merge 2011-09-16 17:49:41 -04:00
Brad Payne (Vir Linden) 6160f12bce merge 2011-09-16 17:38:01 -04:00
prep linden 2aa385aeaf merge 2011-09-16 15:45:56 -04:00
prep linden 1a7e166104 Fix for sh-2443 2011-09-16 15:10:58 -04:00
eli be6e26de42 VWR-26937 FIX FR linguistic, re-commit 2011-09-16 11:51:57 -07:00
eli 48dd723024 sync with viewer-development 2011-09-16 11:49:00 -07:00
Brad Payne (Vir Linden) 77eb3aae04 SH-2440 FIX - first build, then test, then commit 2011-09-16 13:14:30 -04:00
Brad Payne (Vir Linden) 832ed49f5b SH-2440 FIX - avoid calling initInstance() on LLVOAvatarSelf if it already exists 2011-09-16 13:03:10 -04:00
Brad Payne (Vir Linden) ac918730be merge 2011-09-16 09:13:38 -04:00
Oz Linden 2fba01d160 merge changes for storm-1578 2011-09-16 09:07:20 -04:00
Brad Payne (Vir Linden) 7f10e89ce9 merge 2011-09-15 21:41:03 -04:00
Brad Payne (Vir Linden) 1a0865a572 merge 2011-09-15 21:36:39 -04:00
Leslie Linden 1d3f6ef432 EXP-1215 FIX -- New tag toggles on and off during delivery of large purchases
EXP-1216 FIX -- Not all inbox items are sorted properly for large item purchases

* The inventory listener is no longer used to override the folder's creation
  date if the date it has is zero.
2011-09-15 16:13:10 -07:00
eli 6e5ff42f9e VWR-26937 FIX FR linguistic 2011-09-15 14:22:50 -07:00
Brad Payne (Vir Linden) 92fa144dce merge 2011-09-15 16:09:17 -04:00
Oz Linden c1f211cac1 merge changes for storm-1599 2011-09-15 15:28:11 -04:00
Oz Linden daf0b047fa merge changes for storm-1595 2011-09-15 15:27:42 -04:00
Oz Linden d3c05d52e5 merge changes for storm-1585 2011-09-15 15:27:13 -04:00
Oz Linden 3981afe7fd pulled back release tags 2011-09-15 15:26:43 -04:00
Debi King (Dessie) 11dce3b74d reconciled .hgtags 2011-09-15 14:32:55 -04:00
Debi King (Dessie) 671a76b40c Added tag DRTVWR-89_3.0.3-beta2, 3.0.3-beta2 for changeset 61aa7974df08 2011-09-15 14:30:19 -04:00
Debi King (Dessie) caa65cefe2 merge 2011-09-15 13:30:15 -04:00
Richard Nelson 556cd3a53b Automated merge with http://hg.secondlife.com/viewer-development 2011-09-14 19:47:37 -07:00
Richard Nelson 254eb36543 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-09-14 19:46:16 -07:00
Richard Nelson 2809778bf1 EXP-1201 FIX Quit button option not present in Mode Changing and Exit viewer dialogs 2011-09-14 19:45:00 -07:00