Aleric Inglewood
b424d0232b
Make #includes in llcommon header files more complete.
...
These includes are needed. The current code includes them
in .cpp files *before* including these include files, but
that is not very clean, and not useful.
Actually including what a header file needs makes it more
clear what it drags in, it doesn't drag in more then before.
It also allows to include these headers without having to
includes needed for the included header file in a specific
order, in every .cpp file.
2013-11-05 03:01:46 +01:00
Aleric Inglewood
54b43f1ad7
Cache the lookup of the sim access level.
...
Being part of the state line, it is called every frame, causing a
translation lookup every frame.
2013-11-05 03:01:46 +01:00
Latif Khalifa
7ffb751ead
In preparation to release, change defalt for crash reporting to 'Ask'
2013-11-05 02:35:08 +01:00
Inusaito Sayori
7129d97ee5
panel_tools_texture.xml splits off from floater_tools.xml (No real changes here, but this change will make life so nice for me)
2013-11-04 17:49:29 -05:00
Inusaito Sayori
ec55c53b62
French menu gets Motion Resets Camera courtesy of Nomade (more translation on the way)
2013-11-04 17:10:42 -05:00
Drake Arconis
e1356b7aaf
Fix slight breakage in the osx cmake
2013-11-03 23:00:56 -05:00
Latif Khalifa
0cbaa752a6
At the request of LL, append more info to channel string sent to the login server
...
Send versio number bare, without channel name, as V3 does
2013-11-04 04:04:39 +01:00
Inusaito Sayori
2f80012ccd
Feature Request: If EditLinkedParts is on, Copy Key should copy keys of any selected prim(s)
2013-11-03 20:51:48 -05:00
Drake Arconis
1553a90ebb
Merged master
2013-11-03 20:15:41 -05:00
Latif Khalifa
7fe411cd85
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-11-03 21:48:21 +01:00
Inusaito Sayori
083aaffec7
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-11-03 15:28:01 -05:00
Andros Baphomet
997fdebb9f
Re-fix shader compilation errors
2013-11-03 13:12:27 -05:00
Andros Baphomet
fe0a761ce6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
indra/newview/app_settings/shaders/class1/deferred/giF.glsl
indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
2013-11-03 12:17:50 -05:00
Latif Khalifa
232b1cf28c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-03 04:56:31 +01:00
Shyotl
6bbb24b974
Revert occlusion changes to try and pinpoint flicker issue.
2013-11-02 22:43:11 -05:00
Shyotl
827bbc9b89
Fix up a few glowies.
2013-11-02 19:15:28 -05:00
Latif Khalifa
822b728adb
Only build Quicktime on 32 bit Windows
...
Helps address issue 1180
2013-11-03 00:32:01 +01:00
Latif Khalifa
8ed527af24
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-02 12:46:16 +01:00
Shyotl
77eb928380
Add LLGLManager::mIsMobileGF
2013-11-02 03:33:21 -05:00
Shyotl
378dd14ade
Return to our nice ssao.
2013-11-02 03:29:32 -05:00
Shyotl
e5d71560e8
Fix fullbright stuff in deferred. Have to re-assess old glow occlusion bugfixes.
2013-11-02 02:38:23 -05:00
Latif Khalifa
824f23082b
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-02 07:25:36 +01:00
Shyotl
af8f8bb040
Mats.
2013-11-02 01:20:05 -05:00
Inusaito Sayori
23e9eabedb
These new icons need tooltips
2013-11-01 17:57:52 -04:00
Latif Khalifa
b9c487a0c7
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2013-11-01 22:50:22 +01:00
Inusaito Sayori
96e8f37c81
The rest of some touchups to wlf xml for nicer alignment of elements
2013-11-01 17:43:32 -04:00
Inusaito Sayori
0fc9d540bf
Feature Request: Add Camera preset switching functionality (part of quicksettings)
...
Hitting Escape will reset to the normal Back preset
Adds new Cam_Preset_*_(On|Off).png textures, these should probably be reskinned, any volunteers?
2013-11-01 17:35:12 -04:00
Latif Khalifa
1f587d1ad1
Don't crash when trying to export linked parts
...
Fixes issue #1176
2013-11-01 22:34:55 +01:00
Inusaito Sayori
2d421a27e1
Let Ctrl/Shift + scrollwheel changing the camera/focus offsets affect the current preset's setting, not the back preset.
2013-11-01 16:56:55 -04:00
Inusaito Sayori
3934e0c9d3
Fix Issue 1163: Mouselook zoom (silly control group confusion)
2013-11-01 11:18:12 -04:00
Inusaito Sayori
ba1a29aae2
French Translation updates! Provided by Nomade Zhao
2013-11-01 02:56:21 -04:00
Aleric Inglewood
66a43ea537
Make global strerr() functions in llfile.cpp static member functions of LLFile.
...
This is the cleanest way to make them available to the rest of the
viewer as exported functions.
This change is needed for / use by AIMultiGrid.
2013-11-01 00:47:47 +01:00
Latif Khalifa
3d47d6f0dc
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-10-31 16:39:08 +01:00
Latif Khalifa
5583445c4d
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-31 16:38:40 +01:00
Aleric Inglewood
198840f839
Merge remote-tracking branch 'singu/master'
2013-10-31 05:45:25 +01:00
Latif Khalifa
78843493cc
Syntax error fix
2013-10-31 03:31:12 +01:00
Aleric Inglewood
4aa3863f17
Merge remote-tracking branch 'singu/master'
2013-10-31 02:54:00 +01:00
Latif Khalifa
fcfffbb322
breakpad filter signature is different on windows compated to other platforms
2013-10-31 02:51:58 +01:00
Aleric Inglewood
e4b35a050d
This makes more sense
2013-10-31 02:38:23 +01:00
Aleric Inglewood
8506a16dcb
Merge remote-tracking branch 'singu/master'
2013-10-31 02:19:37 +01:00
Latif Khalifa
8dab5df746
Revert "Prevent LLFace::getGeometryVolume from overwriting vbos past their end."
...
This reverts commit 02067f973e .
2013-10-31 02:10:57 +01:00
Aleric Inglewood
811191cc7c
Merge remote-tracking branch 'singu/master'
2013-10-30 21:57:39 +01:00
Aleric Inglewood
a9972bbf02
Suppress spammy warning (debug mode)
2013-10-30 20:32:22 +01:00
Latif Khalifa
51d5984afa
Allocate half a megabyte that is freed just before minidump is written in the breakpad exception handler (Siana)
2013-10-30 19:10:17 +01:00
Latif Khalifa
f1eab3f2c5
Added architecture fields to the crash report
2013-10-30 19:09:05 +01:00
Latif Khalifa
139aad333a
Looks like the older version of freetype has more sever issues.
...
Revert "Downgraded freetype to 2.3.9 to avoid font issues in the newer version"
This reverts commit 3284b77df2 .
2013-10-30 18:43:17 +01:00
Andros Baphomet
c009866d86
Merge remote-tracking branch 'upstream/master'
2013-10-30 09:42:58 -04:00
Inusaito Sayori
73cb43e71f
[Warnings] Fix ..\..\libhacd\hacdRaycastMesh.cpp(109): warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
...
All the other involved types are of size_t, so static_cast 1 should work here.
2013-10-30 08:40:47 -04:00
Inusaito Sayori
b34a8db34a
Modernize constructor of LLPreviewSound and cure crash signature 314
2013-10-30 08:37:20 -04:00
Damian Zhaoying
9be72ffb47
add spanish translation for prefs editor open log in windows option
2013-10-30 05:01:12 -03:00