livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,814 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

973 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
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
Oz Linden 8df635f8bf merge changes for storm-1989 2013-12-16 13:30:00 -05:00
Oz Linden 01cdc87d05 merge changes for storm-1987 2013-12-16 13:29:12 -05:00
Oz Linden a57bcc2790 merge changes for storm-1986 2013-12-16 13:28:05 -05:00
Oz Linden 36281d53ff merge changes for storm-1981 2013-12-16 13:27:13 -05:00
Oz Linden dec487cd7f merge changes for 3.6.12-release 2013-12-12 15:51:43 -05:00
Jonathan Yap 81d1d427f1 OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in OS built viewers 2013-12-11 10:41:28 -05:00
Jonathan Yap 5b40445e66 STORM-1993 In the About Land floater only send object return time to server when it has been changed 2013-12-04 19:38:52 -05:00
Jonathan Yap e390255de6 STORM-1992 'Open voice connection' and 'Expand participant list' buttons are overlapping each other in IM conversation after resizing. 2013-12-04 19:33:10 -05:00
Jonathan Yap 56f9b9c048 STORM-1989 Overlapping UI elements in Upload Model floater 2013-12-03 04:19:23 -05:00
Oz Linden 0c6d06692e merge changes for storm-1987 2013-11-27 12:02:04 -05:00
Jonathan Yap d533dcebf7 STORM-1987 Inconsistent menu naming and behavior in Places floater 2013-11-27 10:26:27 -05:00
Jonathan Yap db8e4824e7 STORM-1986 Added right click Show on Map context menu for Inventory floater landmarks 
Possible fix for BUG-4593
 2013-11-26 19:43:15 -05:00
Oz Linden ced4ccdbd2 merge changes for storm-1984 2013-11-26 19:18:04 -05:00
Oz Linden fe3a930623 merge fix for STORM-1984 2013-11-26 16:09:43 -05:00
Jonathan Yap 6b1d835f95 STORM-1981 Rough initial changes for evaluation purposes. 2013-11-24 15:46:21 -05:00
Oz Linden 45bc601563 merge changes for 3.6.11-release 2013-11-21 14:08:38 -05:00
Oz Linden 0031e9a97b merge up to 3.6.10-release; some of the storm-68 changes lost 2013-11-19 17:59:55 -05:00
Oz Linden 7f39d0472e merge changes for STORM-1831 2013-11-18 13:51:24 -05:00
Oz Linden 84a96cdf0f correct attribution for open-195 2013-11-18 11:33:58 -05:00
Ansariel 3358102462 STORM-1984: Mousing over UI elements does not make them light up 2013-11-14 22:13:15 +01:00
Oz Linden f8846713ce add open-195 to doc/contributions.txt 2013-11-14 09:16:34 -05:00
Ima Mechanique bea2e9822b Fixing some references to 'filename' I forgot to rename to mFullFileSpec. 2013-11-09 11:51:45 +00:00
Oz Linden 5ca4a4b8f3 merge changes for storm-1982 2013-11-05 13:53:23 -05:00
Jonathan Yap 2454bcc8db STORM-=1982 Remove duplicate entry in settings.xml 2013-11-05 10:24:41 -05:00
Jonathan Yap caaaa1e5e6 STORM-1980 Play sound for region restarting message 2013-11-05 10:01:41 -05:00
Ansariel e3739edeff BUG-3764: Groups count in groups list does not display if floater is resized 2013-11-02 21:57:06 +01:00
Oz Linden d61c6ad48b merge changes for storm-1975 2013-11-01 08:46:32 -04:00
Jonathan Yap 07c011bc9c STORM-1975 IM windows occasionally report false typing status. 2013-10-29 15:12:39 -04:00
Tonya Souther 07b5e702e6 BUG-3968: do not wear an object when renaming in inventory 2013-10-29 13:59:21 -04:00
Oz Linden 994ecbed34 add credit for BUG-3863 2013-10-29 13:53:43 -04:00
Graham Linden 6480612a91 Merge 3.6.9 ShareStorm 2013-10-25 10:23:11 -07:00
Oz Linden c9775dde62 merge up to 3.6.9-release 2013-10-23 13:05:59 -04:00
Merov Linden 62999da4d0 Pull merge from oz_linden/336-snowstorm 2013-10-17 13:05:08 -07:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Drake Arconis cda6e4488a STORM-1972 Add forgotten credit in contributions.txt 2013-10-11 18:40:35 -04:00
Ima Mechanique 0c1d6d7d9e Merge v3.6.7 in 2013-10-04 20:47:54 +01:00
Oz Linden 4dccf30bf3 merge changes for 3.6.7-release 2013-10-03 18:04:27 -04:00
Graham Linden 0103cac1dd Merge viewer-bear maint RC changes to get this build closer to the RC it will follow 2013-09-26 11:44:40 -07:00
Oz Linden 6a9d23b71a merge changes for open-189 2013-09-12 14:07:12 -04:00
Drake Arconis 0142a0c6a9 OPEN-189 Add missing header guard 2013-09-11 19:02:36 -04:00
Oz Linden f70296ec68 merge changes for storm-1902 2013-09-11 15:25:24 -04:00
Oz Linden f6bcf6dd39 merge changes for vwr-29543 2013-09-11 12:47:25 -04:00
ZaiLynch f4d2e21f4f Changing shortcut to toggle preference floater 2013-09-11 12:17:22 -04:00
Oz Linden d53f9366d0 merge changes for storm-1888 2013-09-09 16:04:45 -04:00
simon e7ac4695e3 Merge viewer-release 2013-09-09 12:59:17 -07:00
Graham Linden 2df58f775f Merge viewer-release 3.6.6 2013-09-09 12:43:10 -07:00
Oz Linden c4b070ae00 merge changes for 3.6.5-release 2013-09-09 14:51:34 -04:00
katharine@exodusviewer.com 2108e9de5b OPEN-149: fix documentation of LLColor4 constructor for F32 vector 2013-09-04 16:37:33 -04:00
Oz Linden 1a72325ef1 merge changes for open-154 2013-09-04 16:15:15 -04:00
Oz Linden 96f0d930bc merge changes for open-187 2013-09-04 09:18:53 -04:00
Nicky 5172d4edac OPEN-187: Properly cleanup all allocated OpenSSL structures. 2013-09-03 13:50:35 -04:00
Oz Linden f3043428b0 merge changes for storm-1933 2013-08-29 12:54:52 -04:00
Oz Linden 5b799244c3 merge changes for storm-1929 2013-08-28 13:05:07 -04:00
Oz Linden a359d9d80c merge changes for 3.6.4-release 2013-08-27 10:37:02 -04:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00
Oz Linden 7ca10e5161 merge changes for 3.6.4-release 2013-08-26 15:14:12 -04:00
Oz Linden 1e2a6ee3f4 merge changes for maint-2773 2013-08-22 14:39:40 -04:00
Ansariel be07694b9c MAINT-2773: Disable texture animation doesn't work 2013-08-22 00:51:15 +02:00
Oz Linden ba248b8b5d merge changes for storm-1953 2013-08-21 10:44:12 -04:00
Oz Linden c15d2e87ac merge changes for storm-1952 2013-08-21 10:40:57 -04:00
Oz Linden c42a91421f merge changes for 3.6.3-release 2013-08-20 10:37:10 -04:00
Oz Linden 70cacc4d17 merge changes for 3.6.3-release 2013-08-19 15:51:40 -04:00
Oz Linden 82bf4e4db2 merge changes for DRTVWR-285 2013-08-19 15:15:15 -04:00
Oz Linden 731fe3e7c6 merge changes for 3.6.3-release 2013-08-19 15:14:23 -04:00
Oz Linden d2b947c1fa merge changes for STORM-1932 2013-08-14 18:12:01 -04:00
Nicky e7bc0e6e63 BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars. 2013-08-14 01:00:41 +02:00
Oz Linden b75213b39a open-185: remove duplicate gperftools entry in autobuild.xml 2013-08-05 11:19:54 -04:00
Oz Linden 91f7d0d154 merge changes for storm-1838 2013-07-29 15:19:54 -04:00
Oz Linden fd3d20e20d add credit for storm-1958 2013-07-29 14:49:19 -04:00
Jonathan Yap 22a931efad STORM-1957 World Map - Land For Sale is missing L$ / sqm 2013-07-28 10:42:51 -04:00
Oz Linden 9f393c1d99 merge up to latest snowstorm integration branch 2013-07-24 14:40:23 -04:00
Oz Linden f81e2ce680 credit Cinder with STORM-1951 2013-07-24 14:28:30 -04:00
Oz Linden 725288e93a add contributions for Materials 2013-07-16 15:53:37 -04:00
Oz Linden c18c1f2def merge changes for storm-1952 2013-07-15 15:37:45 -04:00
Graham Linden c50f44e04e Merge viewer-release 3.6.5 2013-08-26 14:57:54 -07:00
Graham Linden 547fb5da61 Make sure TankMaster is in the contribs for STORM-1950 2013-08-22 17:38:55 -07:00
Oz Linden ecb1e57326 merge changes for storm-1953 2013-07-02 12:55:52 -04:00