dc353c205a
Merge
2014-06-10 20:27:31 -07:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
0bd16e2e20
Fixed warnings:
...
* LLView::getChild: Making dummy class LLButton named "Profile..." in land_general_panel
* LLView::getChild: Making dummy class LLUICtrl named "current_url" in land_media_panel
2014-04-11 14:05:08 +02:00
39e980f2b9
FIRE-9211: Add counter to parcel ban and access lists
2014-04-10 14:59:40 +02:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
cb2045fcd5
Merge downstream code with viewer-release
2014-02-10 16:11:50 -08:00
50cba7940f
Merge in downstream code for 3.6.13
2013-12-09 16:11:09 -08:00
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
d5555e3df7
FIRE-10043: Add teleport to landing point button in about land floater
2014-03-20 14:47:06 +01:00
b28fd8c50d
Merge
2014-02-08 14:19:19 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
34ff2fc46b
merge with release
2013-12-02 14:57:29 -08:00
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
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
10705b4360
Merge 3.6.11 for RC-ability
2013-11-11 15:50:01 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
75866dd6a6
FIRE-12551: Enable group access by default again if public access is removed so we don't get surprised and unintentionally banned from the land!
2014-02-06 13:01:15 +01:00
970ee73e9a
Fix release merge issues (included upstream changes not yet in release from bear)
2013-10-25 11:48:43 -07:00
6480612a91
Merge 3.6.9 ShareStorm
2013-10-25 10:23:11 -07:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
7e21af544c
Remove unneeded and wrong setting of owner name for parcel objects owner list and set loading string as default
2014-01-28 09:28:42 +01:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
3bfac42f07
MAINT-3159 FIXED Disable buttons when refreshing ui.
2013-09-23 13:07:56 +03:00
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
f3043428b0
merge changes for storm-1933
2013-08-29 12:54:52 -04:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
64c5afa196
Merge latest viewer-release with FBC
2013-10-23 14:14:36 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
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
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
c7bab8ab8b
Merge
2013-04-11 16:04:21 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
98a82c50d5
Pull in downstream CHUI code from viewer-development
2013-03-25 11:12:52 -07:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
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
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
f3025b0ae4
STORM-1933: Certain show in search categories for parcels will not stay selected
2013-02-23 02:01:07 +01:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
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
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
4dccf30bf3
merge changes for 3.6.7-release
2013-10-03 18:04:27 -04:00
Tank_Master