Commit Graph

946 Commits (03e15a2c56ddd4a67818d9047a9db3ee2d23d1dc)

Author SHA1 Message Date
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
Oz Linden a25bcb8523 merge changes for storm-1980 2014-01-07 13:44:22 -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
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 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
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
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
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
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08: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