Commit Graph

950 Commits (ebd94bf07a02beee8fbf84ec172bcbf1ac3d475f)

Author SHA1 Message Date
Cinder 8d2e0fb3a0 STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting 2014-06-20 13:43:31 -06:00
Cinder 984353d7ca STORM-2036 - Fix trying to parse caps too early by adding a callback to check region caps when they haven't already been received 2014-06-20 11:02:50 -06:00
Oz Linden 9353868d91 merge changes for STORM-1831 2014-04-23 11:53:05 -04:00
Oz Linden 6c8bddca3d merge changes for STORM-1915 2014-04-22 16:01:45 -04:00
Oz Linden b4ca93cadc merge up to 3.7.6-release 2014-04-22 13:05:26 -04:00
Oz Linden cd382d08c8 add Cinder Roxley to contributors for STORM-1831 2014-04-22 13:04:36 -04:00
Oz Linden d60519d253 merge changes for STORM-2007 2014-03-18 10:46:52 -04:00
Oz Linden c617a2aa33 merge changes for STORM-1966 2014-03-18 09:10:19 -04:00
Oz Linden 51e04f8866 merge changes for open-209 2014-03-14 14:54:45 -04:00
Oz Linden a64b1d0d30 merge changes for storm-2007 2014-03-14 14:34:06 -04:00
Oz Linden 56d1db4875 merge changes for storm-1920 2014-03-14 14:19:36 -04:00
Ricky Curtice e9116575bf OPEN-209: Corrected all instances of trigraphs in the code.
Trigraphs can cause some real special headaches.  The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
Oz Linden 54bc8b10ee merge changes for storm-2018 2014-03-11 16:43:00 -04:00
Oz Linden 529edff468 restore the relevant fixes for STORM-2011 2014-03-11 14:03:38 -04:00
Oz Linden 2b4d3fff70 back out STORM-2011 due to conflict 2014-03-10 15:46:49 -04:00
Jonathan Yap 2d6314f93f STORM-2018 Group invite fails to let you join groups when groups maxed even when you leave group 2014-03-07 12:50:08 -05:00
Oz Linden 208d9a2d21 merge changes for storm-2010 2014-03-06 14:55:11 -05:00
Oz Linden 43eae43798 merge changes for storm-68 2014-03-06 13:01:12 -05:00
Oz Linden 9185f1e256 merge changes for storm-2008 2014-03-06 08:30:47 -05:00
Oz Linden a373a7442c merge changes for 3.7.2-release 2014-03-04 13:15:43 -05:00
Oz Linden ef794e7ffc merge changes for storm-2015 2014-03-04 11:55:42 -05:00
Oz Linden 413d29d3ee merge changes for bug-1044 2014-03-04 11:22:19 -05:00
Ricky Curtice fe2801fc63 STORM-2017: Added translatable help text to rotation.
I chose the camera’s up vector to place the help text as it provided a consistent location on the screen for the user to see the text pop up.

While doing this I realized that the calls to hud_render_utf8text utilized a condition that was guaranteed to be false based on a surrounding if-statement, and so could trivially be replaced with a constant.
Also cleaned out a compiler warning about unused private member variables in llmaniptranslate.  I don’t like warnings and useless code. :P
2014-03-03 21:50:12 -08:00
Oz Linden fbdbea1b18 merge changes for 3.7.2-release 2014-03-03 17:01:19 -05:00
Oz Linden ce284c28d8 merge changes for 3.7.2-release 2014-03-03 15:43:55 -05:00
Oz Linden a5e56067c2 merge changes for 3.7.2-release 2014-03-03 15:36:34 -05:00
Oz Linden 55ceeae752 merge changes for storm-2008 2014-03-03 15:29:32 -05:00
Oz Linden dfbc6c65f6 merge changes for open-203 2014-03-03 15:08:20 -05:00
Jonathan Yap 840e1da8aa STORM-2017 Untranslatable text appears when scaling, or moving objects 2014-03-03 14:08:26 -05:00
Oz Linden 1d30fe9554 merge changes for 3.7.2-release 2014-02-25 13:31:01 -05:00
Jonathan Yap 199e65a6c5 STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only. 2014-02-24 10:57:53 -05:00
Oz Linden b0c255f4e6 merge up to 3.7.0-release and get unit test fixes 2014-02-11 09:20:58 -05:00
Jonathan Yap 61dde95630 STORM-1915 Add name to contributors 2014-02-10 20:19:54 -05:00
Oz Linden 8312517857 merge changes for storm-2011 2014-01-31 16:21:50 -05:00
Oz Linden 48dbcd1d43 STORM-2010: fix to AutoAcceptNewInventory 2014-01-29 18:16:04 -05:00
Ansariel 86676ec34b STORM-2011: Group member lists not loading properly 2014-01-28 19:45:50 +01:00
Oz Linden d8cc2476b3 merge changes for MAINT-3187 2014-01-24 15:00:52 -05:00
Oz Linden b2cc4feed2 correct coding style problems, add contribution credit 2014-01-23 13:41:52 -05:00
Oz Linden 197db4976a merge changes for 3.6.13-release 2014-01-23 11:07:32 -05:00
Oz Linden c241bb2af8 merge changes for storm-1972 2014-01-22 17:14:13 -05:00
Ansariel 316bf51482 MAINT-3187: Name list controls do not properly resolve avatar names 2014-01-21 15:11:10 +01:00
Jonathan Yap ebac8c0a2a STORM-2007 Buy floater displays truncated names/permissions when object is set to sell original and sell copy. 2014-01-14 10:34:08 -05:00
Oz Linden a25bcb8523 merge changes for storm-1980 2014-01-07 13:44:22 -05:00
Oz Linden 69c32b04cf merge changes for 3.6.12-release 2014-01-07 11:39:06 -05:00
Oz Linden 30f0d61510 merge changes for 3.6.12-release 2014-01-03 12:14:03 -05:00
Oz Linden 94ac0ffdc3 merge changes for 3.6.12-release 2013-12-19 17:32:58 -05:00
Oz Linden 8b01fd42b0 merge changes from project qa viewer 2013-12-19 17:30:58 -05:00
Oz Linden 9f056c1ddd merge changes for open-113 2013-12-17 11:16:02 -05:00
Oz Linden e774431783 merge changes for storm-1993 2013-12-16 13:31:49 -05:00
Oz Linden f1acdc56b2 merge changes for storm-1992 2013-12-16 13:30:56 -05:00