dc353c205a
Merge
2014-06-10 20:27:31 -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
5bef957159
MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling
2013-12-06 15:44:18 -08:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
dc54af030e
MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for linked objects
...
Removed "geometry" and "surface" Reviewed by Kelly
2013-08-27 14:57:43 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06: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
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
e589f47e5e
MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and corrected related tooltips
2013-07-02 18:41:03 +00:00
ccc8577798
MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by Kelly.
2013-07-02 17:59:43 +00:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
8a16b55bf8
MAINT-2711 : Add missing LSL constants for llGetObjectDetails() to the viewer.
...
Reviewed by Kelly
2013-05-21 09:11:50 -07:00
a099815774
Merge vwr-dev-mat
2013-05-11 08:11:13 -07:00
f2455ccaaf
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10 16:10:25 -07:00
5717bcf4ae
MAINT-2672 Make windows flex/bison inputs identical to other platforms to make bison >= 2.7 work
2013-05-10 12:15:25 -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
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
3834cb6f8a
Fix linux breakage from sunshine merge
2013-04-26 09:02:31 -07:00
4bd3fef6f7
MAINT-2612 fix issues between extern C linkage and yyval ifdefs on Mac with toolchain > 4.5.1
2013-04-22 13:29:33 -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
a8245c51b9
MAINT-2506 added viewer support for PERMISSION_SILENT_ESTATE_MANAGEMENT and PERMISSION_OVERRIDE_ANIMATIONS. Reviewed by Simon.
2013-03-19 19:25:24 +00:00
7a71c094b9
MAINT-2410 Extra Particle Parameters -- port of Kelly's simulator changeset
2013-03-08 18:12:19 -06:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
8a451a9345
Misc sweep to sync up a few things
2013-07-13 13:59:15 -06:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
b8bd81f7f3
MAINT-2109 Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions for LSL scripts and script information floater. Reviewed by Andrew.
2012-12-13 19:59:47 +00:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
95f3fb45ae
Cherry-picked windows build fixes from sunshine-experimental
2012-09-24 19:42:58 +00:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
2c9e821188
Rename HAS_OPENSIM_SUPPORT switch to OPENSIM
2013-02-18 21:24:20 -07:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
4ac7e555e9
Add OSSL/AA syntax highlighting to OpenSim builds
2012-12-13 23:30:24 -07:00
3ccda1f285
MAINT-922 FIX Client side code to catch the SCRIPT_PERMISSION_TELEPORT request from similator and display a notification
...
Reviewed by Simon
2012-04-16 14:29:32 -07:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
f368c858cd
correct line endings
2011-08-17 12:09:59 -04:00
918238dd18
ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
...
Privacy" changes. Many naming changes for the featureto be "See avatars"
instead of "hidden avatars". Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
2011-07-01 14:06:08 -07:00
5039378869
ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars"
2011-06-09 13:46:19 -07:00
ff3289e2f3
ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. Reviewed by Kelly.
2011-05-13 13:56:49 -07:00
60f831151e
Compile flag for wchar_t, boost 1_45 lib update, indra.l include ordering adjustment
2011-01-20 11:03:53 -08:00
bef8751bff
Merged with RLVa-1.4.3 tip
2011-11-10 23:17:58 +01:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
Tank_Master