52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -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
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -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
4165f2eac8
merge latest integration repo changes
2013-05-11 11:30:20 -04: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
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04: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
06f9f7b2d9
merge
2013-05-03 21:48:17 +00:00
474905bade
MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
...
* Add the newer run time permissions to the viewer
* Filter requested permissions by those the viewer knows about
* Show a dialog indicating unknown permissions were requested and a new viewer
will be needed to grant them.
reviewed with Simon and Soft
2013-04-30 16:04:41 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -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
cd8cd8c265
Fix merge oddities
2013-04-12 09:26:59 -07: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
9a7a19c77a
Merge
2013-03-13 17:13:45 -05:00
e8b8a12b73
Mods to make compile on gcc 4.6.3 work mo betta
2013-03-12 10:48:05 -07:00
7a71c094b9
MAINT-2410 Extra Particle Parameters -- port of Kelly's simulator changeset
2013-03-08 18:12:19 -06: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
62f04088f0
Dynamically loaded script library
...
*Script libraries for different platforms are loaded dynamically at startup via xml
*Remove unused LSO byte code compiler
2013-06-20 11:24:34 -06:00
d495e952fb
FIRE-10600: Added support for new LSL functions and constants in Server RC LeTigre/BlueSteel 13.06.06.277104
2013-06-11 23:54:18 +02:00
8aa64bc1c4
Added LSL script editor support for new json functions/constants
2013-05-15 11:18:30 +02:00
986f51e3cd
Update script permission dialog questions and synchronize with V3
2013-05-10 21:33:45 +02:00
3b4a1283ef
FIRE-9749: Missing dialog text for PERMISSION_SILENT_ESTATE_MANAGEMENT and PERMISSION_OVERRIDE_ANIMATIONS
2013-04-12 16:50:10 +02:00
c46befac91
Added LSL editor syntax support for new functions and keywords:
...
* llSetAnimationOverride
* llGetAnimationOverride
* llResetAnimationOverride
* PERMISSION_SILENT_ESTATE_MANAGEMENT
* PERMISSION_OVERRIDE_ANIMATIONS
2013-03-28 15:48:20 +01: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
94ebb25050
Updated LSL syntax highlighting
2012-10-19 09:31:28 +02:00
4b1d3ca444
Added new LSL functions from PF tools merge to LSL editor
2012-08-08 02:45:38 +02: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
c5894c2781
Merge with Firestorm LGPL
2012-06-08 22:43:34 +02:00
a535dacd42
Added support for user experience LSL functions released with Server RC Magnum 12.05.25.258071
2012-06-02 13:43:38 +02:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
Tank_Master