Commit Graph

212 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
maksymsproductengine b1c5edc513 Merge viewer-release and become version 3.7.16 2014-09-09 21:42:26 +03:00
Oz Linden 7062026da4 merge changes for STORM-2030 2014-08-06 16:17:55 -04:00
Jonathan Yap ce27987c87 STORM-2030 Rapidly clicking the refresh button in selected floaters may result in duplicate entries 2014-05-12 16:25:48 -04:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
andreykproductengine b1cffda8f3 MAINT-2361 FIXED One and the same user shown in Allowed and in Banned Residents lists 2014-04-23 19:47:19 +03:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
simon cb2045fcd5 Merge downstream code with viewer-release 2014-02-10 16:11:50 -08:00
simon 50cba7940f Merge in downstream code for 3.6.13 2013-12-09 16:11:09 -08: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
Richard Linden 34ff2fc46b merge with release 2013-12-02 14:57:29 -08:00
Mnikolenko ProductEngine 02453cacd0 MAINT-3496 FIXED Disable "Allow group access" option if "Sell passes to: group" is selected(and vice versa). 2013-11-27 13:03:14 +02:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Graham Linden 10705b4360 Merge 3.6.11 for RC-ability 2013-11-11 15:50:01 -08:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Graham Linden 970ee73e9a Fix release merge issues (included upstream changes not yet in release from bear) 2013-10-25 11:48:43 -07:00
Graham Linden 6480612a91 Merge 3.6.9 ShareStorm 2013-10-25 10:23:11 -07:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Mnikolenko ProductEngine 3bfac42f07 MAINT-3159 FIXED Disable buttons when refreshing ui. 2013-09-23 13:07:56 +03:00
Oz Linden ea305b74d1 remove refresh of search attributes from draw method in About Land floater; does not seem to be needed and slows things down 2013-08-29 12:56:20 -04:00
Oz Linden f3043428b0 merge changes for storm-1933 2013-08-29 12:54:52 -04:00
Xiaohong Bao d8c02bf062 Merge 2013-08-19 16:09:28 -06:00
simon 64c5afa196 Merge latest viewer-release with FBC 2013-10-23 14:14:36 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
simon d27fc4ad33 MAINT-2257 : Create ability to limit region/estate and parcel access by
either Piof or Group membership (viewer changes).   Using Mnikolenko's patch
2013-08-07 15:56:29 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Richard Linden 3a0e45ff08 SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
2013-05-10 17:57:12 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon c7f7c4bc4d Merge viewer-beta 2013-05-09 13:14:49 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon 066f2acadf Forgot to commit @#! merge 2013-04-11 16:23:36 -07:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
simon c7bab8ab8b Merge 2013-04-11 16:04:21 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
simon 98a82c50d5 Pull in downstream CHUI code from viewer-development 2013-03-25 11:12:52 -07:00
Simon Linden d5561a1ada Merge in viewer-beta to get CHUI code 2013-03-19 16:20:53 -07:00
callum_linden 79edd066a4 MAINT-2497 FIX (Viewer) - viewer side change that goes with server side fix - adds direction when you set a TP landing point 2013-03-18 17:00:29 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Ansariel f3025b0ae4 STORM-1933: Certain show in search categories for parcels will not stay selected 2013-02-23 02:01:07 +01:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Maestro Linden 1840290414 MAINT-2121 Fixed case where changing other parcel option disables 'Show place in search'. Reviewed by Simon. 2012-12-14 19:46:24 +00:00
Merov Linden d840a60ecc CHUI-373 : Fix : Refresh panel after setting parcel for sale 2012-10-18 21:49:02 -07:00
Gilbert Gonzales d67c295d8b CHUI-305: Minor changes after code review. Using templated findChild() instead of getChildView(). Also using settings.xml to store common custom variables. 2012-08-30 16:20:27 -07:00
Gilbert Gonzales be61b5be2f CHUI-305: Problem: The 'resident picker' had multiple parents and due to the design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'. 2012-08-29 19:18:25 -07:00
Don Kjer 64d9705ae2 Expanding region flags to 64 bits. Adding region protocol flags 2012-08-17 03:56:38 +00:00
maxim_productengine 1341d591e3 MAINT-269 FIXED Check if current agent is owner of the parcel before enabling "Buy pass" 2012-08-08 16:01:28 +03:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00