Ansariel
b3baed5cbc
Copy standard presets to the correct folder
2018-06-05 17:02:25 +02:00
Ansariel
1d1634c960
Add additional controls to a camera preset: ZoomTime, CameraPositionSmoothing, EditAppearanceLighting, FSDisableMouseWheelCameraZoom & DisableCameraConstraints
2018-06-05 16:22:08 +02:00
Ansariel
0f20304d76
Move "Advanced Camera View" into Preferences -> Move & View -> View and make things work properly
2018-06-05 16:13:26 +02:00
Ansariel
efa8baca1d
Merge viewer-camus
2018-06-05 13:21:11 +02:00
Ansariel
1d6fdc9356
Disable stencil test for various HUD-related render operations
2018-06-03 16:25:37 +02:00
Ansariel
6c6d021ca0
Undo previous change
2018-06-03 16:20:44 +02:00
Ansariel
01422078e9
Fix name tags and voice indicators becoming invisible when selecting mesh
2018-06-03 15:00:32 +02:00
Ansariel
f2a22123b0
Add fast timer for growl notifications for diagnostics
2018-06-03 13:49:25 +02:00
Ansariel
73038685a2
"Show original" doesn't show item if it's in the inbox folder and the inbox folder isn't shown in normal inventory
2018-06-01 20:44:17 +02:00
Ansariel
da317b6f7b
Merge LL viewer-release 5.1.5
2018-06-01 17:30:01 +02:00
Graham Linden
3ed3cfce56
Merge 5.1.6
2018-05-31 20:12:26 +01:00
Oz Linden
40d4e8b2e6
increment viewer version to 5.1.6
2018-05-31 14:32:43 -04:00
Oz Linden
a51ce32598
Added tag 5.1.5-release for changeset 2ea47f358b17
2018-05-31 14:32:43 -04:00
Graham Linden
eb8eaa58a4
Merge storm-2145 dev into lindenlab branch parented from viewer-release
2018-05-31 17:10:48 +01:00
Ansariel
ffc621be27
Merge viewer-cougar
2018-05-30 21:29:41 +02:00
Ansariel
d4c3570c73
Merge Firestorm LGPL
2018-05-30 21:27:56 +02:00
Ansariel
8bd70f4111
Hide remaining controls on texture tab in build floater if necessary
2018-05-29 18:51:18 +02:00
Ansariel
d8b4d490d4
Disable correct control
2018-05-29 17:19:15 +02:00
Ansariel
491ff2245b
Make RLVa version string localizable
2018-05-29 16:23:38 +02:00
Ansariel
0d7cdab79b
More RLVa fixing.. again
2018-05-29 14:04:25 +02:00
Tonya Souther
1e195c6f96
Compile fix for OS X.
2018-05-28 18:15:01 -05:00
Ansariel
7b9873418e
Remove duplicate declaration of friend class LLSingleton<RlvForceWear>
2018-05-29 00:43:01 +02:00
Ansariel
f2fc92d335
Remove .hgeol
2018-05-28 23:18:55 +02:00
Ansariel
c953663deb
Merge closed branch
2018-05-28 21:58:58 +02:00
Ansariel
ce29305cb8
Close Appearance-Misc branch
...
--HG--
branch : Appearance-Misc
2018-05-28 21:57:50 +02:00
Ansariel
c36579e7de
Merge
2018-05-28 21:01:30 +02:00
Ansariel
f6a50945f3
Merge
2018-05-28 21:01:11 +02:00
Nicky
08e6deee68
Replace "None" with "NoMatch" as "None" is a "#define None 0" deep inside some X headers. Which won't end well if used inside the enum.
2018-05-27 19:33:34 +02:00
Ansariel
a25a6dcb0b
Sync grids.xml with FSData version
2018-05-27 14:05:23 +02:00
Ansariel
c314f8f5b0
Merge closed branch
2018-05-27 01:07:06 +02:00
Ansariel
1d458ec57b
Close Viewer-Build branch
...
--HG--
branch : Viewer-Build
2018-05-27 01:06:00 +02:00
Ansariel
726f09e1bb
Use LLAppearanceMgr::syncCofVersionAndRefresh() during texture rebake only if the IncrementCOFVersion cap is available
2018-05-26 22:50:47 +02:00
Ansariel
9913364437
Merge with Firestorm LGPL
2018-05-26 22:43:23 +02:00
Ansariel
6f2561c795
Sync with Firestorm LGPL
2018-05-26 22:42:53 +02:00
Kitty Barnett
577288d236
Merged with RLVa features & fixes
2018-05-26 18:08:53 +02:00
Kitty Barnett
388310127c
Merged with RLVa default merge (null merge)
2018-05-26 16:54:33 +02:00
Kitty Barnett
5e22b5b4b5
Merged with RLVa fixes
2018-05-26 16:11:46 +02:00
Kitty Barnett
df98d18a6a
Merged with RLVa default merge (null merge)
2018-05-26 15:31:35 +02:00
Kitty Barnett
976285bd8c
Merged with RLVa ancestor (should have been a null merge)
2018-05-26 13:26:06 +02:00
Kitty Barnett
75807eae93
Merged with Appearance-Misc ancestor (semi-null merge)
...
-> Reapply missing 3bfcd48aafac
-> Don't use LLAppearanceMgr::syncCofVersionAndRefresh()
2018-05-26 13:19:22 +02:00
Andrey Kleshchev
c2a2590a7d
MAINT-8693 Fixed crashes during login if you wear a BOM tattoo layer
2018-05-25 21:11:54 +00:00
Nicky
82afd1628a
Linux/OSX: FMOD Studio 1.10.05
2018-05-24 12:09:09 +02:00
Ansariel
cf291a154b
Update FMOD Studio to 1.10.05 on Windows
2018-05-24 00:40:43 +02:00
Nicky
bb9a6326a7
Tweak GCC test a little so it works with older cmake versions.
2018-05-22 07:12:31 +02:00
Nicky
61008b4059
Add a dullahan version for GCC5+, this is exactly the same source as the "normal" version, just compiled on Ubuntu 16.04 with GCC 5.4.0. This allows self compilers to compile with a newer GCC instead of alwayss having to fall back to GCC 4.9.x
2018-05-22 05:01:34 +02:00
Nicky
1443a95e7a
FIRE-22579; Window resize fix in updated 3P SDL. (Linux x86)
2018-05-22 03:27:26 +02:00
Nicky
d6ee731e49
FIRE-22579; Window resize fix in updated 3P SDL.
2018-05-21 19:43:00 +02:00
Graham Linden graham@lindenlab.com
f86073d609
Fix broken integration and unit tests.
...
Update KDU stubs in integration test.
Work around MAINT-8675 stale cert in llsechandler_basic for now.
Update stubs for LLTrans::getString in handful of integration tests.
2018-05-21 17:54:54 +01:00
AndreyL ProductEngine
734ce6110f
Merged in oz_linden/maint-8675
2018-05-30 06:39:50 +03:00
Nat Goodspeed
ec8ee33939
MAINT-8675: In Darwin-specific CMake, use cp, not cmake -E copy.
...
cmake -E copy does only one file at a time, and older CMake versions don't
handle wildcards. But cmake -E copy is specifically for portability. When the
copy operation itself is Darwin-only, we can count on having 'cp' available.
2018-05-24 16:01:50 -04:00