7d0550b1aa
Merged with default tip (Revision 88920f264719)
...
--HG--
branch : RLVa
2015-12-07 18:56:12 +01:00
09f61f59a8
Merged with default tip (Revision a48d42d15595)
...
--HG--
branch : RLVa
2015-07-18 04:37:27 +02:00
949942c730
merge changes for 3.7.29-release
2015-06-08 16:33:02 -04:00
839fe0fa12
Merged with default tip (Revision ffde74743e89)
...
--HG--
branch : RLVa
2015-05-09 00:53:24 +02:00
c4d557d529
Merged with default tip (Revision aeab2661776f)
...
--HG--
branch : RLVa
2014-10-29 21:45:12 +02:00
5bf9343a41
Update to build on Xcode 6.0: replace logical && with bitwise version
2014-10-17 16:14:27 -07:00
d576e66210
Pulling over more lsl changes to support the adding of the LSL_XP_XXX constants
2014-08-06 13:49:29 -07:00
4734e381df
fixed XP_ERROR_... constants
2014-07-17 14:55:19 -07:00
0481494c2d
Merge with 3.7.8-release
2014-05-20 10:03:09 -07:00
48fece4473
Merge with 3.7.7-release
2014-05-07 11:14:26 -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
c2c060d440
Merge with 3.6.7
2013-10-04 09:19:25 -07:00
7dd730473b
Merged with default tip (Revision 35f1667645bc)
...
--HG--
branch : RLVa
2013-10-09 22:49:44 +02:00
f1e09a95f2
Merged with default tip (Revision 0568de92960a)
...
--HG--
branch : RLVa
2013-09-02 11:30:14 +02: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
f86da8b241
constify sgring constants for gcc
2013-08-22 11:23:19 -07:00
ed48c490e0
fixed XP_ERROR rules
2013-08-22 09:38:32 -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
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07: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
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
Kitty Barnett