Commit Graph

20318 Commits (6f7e2856faebc80ca6c7c16aba043f9f2960e45d)

Author SHA1 Message Date
Kitty Barnett 6f7e2856fa Merged with default tip (Revision d561a2e60e1c)
--HG--
branch : Appearance-Misc
2011-10-04 11:13:05 +02:00
Kitty Barnett c4195f03bd - fixed : viewer crashes or refuses to start when TeamViewer is installed or running
-> see http://jira.phoenixviewer.com/browse/FIRE-3062

--HG--
branch : Viewer-Build
2011-09-14 18:31:23 +02:00
Kitty Barnett 7daf7c503c Merged with default tip (Revision a6a9f8b72b7e)
--HG--
branch : Viewer-Build
2011-09-06 12:44:36 +02:00
Kitty Barnett 229d26dccd - internal : updated patch description for Viewer-Build
--HG--
branch : Viewer-Build
2011-09-06 12:32:55 +02:00
Kitty Barnett 4f62758ef4 Merged with default tip (Revision 18bc647c70e4)
--HG--
branch : Viewer-Build
2011-09-02 16:30:24 +02:00
Debi King (Dessie) deddcfb8c5 Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aa 2011-09-02 10:13:04 -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 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
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
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
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
Kitty Barnett b547595ed4 Merged with Viewer-Build tip
--HG--
branch : Appearance-Misc
2011-08-24 13:53:45 +02: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
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
Oz Linden aa1424365e merge changes for open-107 2011-08-22 09:57:55 -04:00
Oz Linden f73db20e0d increment viewer version to 3.0.3 2011-08-22 09:07:15 -04:00
Oz Linden aff45cf5bf Added tag 3.0.2-start for changeset f2412ecd6740 2011-08-22 09:06:28 -04:00
Oz Linden 5bc9b401ed adjust build parameters for Snowstorm team builds 2011-08-22 09:06:00 -04:00
Vadim ProductEngine e7fb4ef954 STORM-1542 FIXED Changed search URL back from search-beta to search.sl.com. 2011-08-22 14:23:34 +03:00
Vadim ProductEngine 5578c285d8 STORM-1543 WIP More cleanup and comments. 2011-08-22 14:01:18 +03:00
Oz Linden a5814da7a6 merge changes for storm-1554 2011-08-22 06:31:10 -04:00
Dave Parks 2434a39c25 merge 2011-08-20 15:35:08 -05:00
Dave Parks 63c420d8dd Merge 2011-08-20 15:33:57 -05:00
Kitty Barnett accb19a9c5 - internal : updated patch description for Viewer-Build
--HG--
branch : Viewer-Build
2011-08-20 21:16:59 +02:00
Oz Linden 49d1c9f05e update BuildParams for Snowstorm Team builds 2011-08-20 12:43:45 -04:00
Oz Linden e18e1375a0 merge changes for .v-r 2011-08-20 08:49:31 -04:00
Oz Linden f34b579e53 merge back release tags 2011-08-20 08:48:51 -04:00
Oz Linden 958eaee399 merge back beta tags 2011-08-20 08:48:30 -04:00
Oz Linden abfbd86598 merge changes for storm-1562 2011-08-20 07:16:01 -04:00