Latif Khalifa
054d67669f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-19 06:28:45 +01:00
Shyotl
503e5287cd
Fix minor oversight that broke openal audio impl.
2013-11-18 23:27:29 -06:00
Latif Khalifa
7187ceb0ac
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-19 05:14:46 +01:00
Latif Khalifa
594eacb480
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-19 04:44:55 +01:00
Latif Khalifa
f21bec1ab9
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-11-19 04:44:47 +01:00
Latif Khalifa
e6977de12f
Mac build changes to create specific channel installers
2013-11-19 04:19:48 +01:00
Latif Khalifa
c99f54367d
Use viewer channel as the basis for installer file names
2013-11-19 00:50:06 +01:00
Latif Khalifa
c6ec03ab19
Re-enable generating tarballs when packaging on Linux
2013-11-19 00:52:59 +01:00
Latif Khalifa
cce3809a26
Autogenerate version numbers on Mac too
2013-11-19 00:28:05 +01:00
Latif Khalifa
7183797e05
Autogenerated versioned windows resource files
2013-11-19 00:12:34 +01:00
Aleric Inglewood
7b9f854c66
Fix for 'with active responder' llerrs crash.
...
This fixes at least one case (crash report 8407), which comes
down to not cleanly informing a responder of failure when the
request url is empty (or so badly formed that it isn't a valid
url). As a result, the statemachine would abort() without
informing the responder - which is bad, sort of.
The previous cases where the responder needed to be informed
of a failure, namely "statemachine timed_out()" and "bad_socket()"
when a socket suddenly becomes bad for unknown reason, have been
replaced with the more general 'aborted()' function, which must
be called before the statemachine calls abort(). Clearly this
has been done for all cases of abort() now, so that if the
llerrs fires again in the future then that would have to be
after the statemachine calls finish(), which is still as "impossible"
as it was - hence the llerrs is still there to make sure.
The reason that this seldom happened on SL, and more often on
opensim, even more often on home-brew test grids, seems plausible:
malformed urls happen more in those cases.
I also took the opportunity to improve the robustness of cases
where the curl error code is checked: it makes no sense to check
what curl gives as error code when an internal error occurred.
2013-11-18 18:16:26 +01:00
Shyotl
b9d2ad3132
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2013-11-18 10:38:39 -06:00
Shyotl
8aa4d0fd27
Removed fasttimer that was hurting perf a tiny bit.
2013-11-18 09:58:21 -06:00
Shyotl
030588caaf
Underwater shadows.
2013-11-18 09:57:35 -06:00
Shyotl
be249ac8a1
Font update. Minor refactor, and removed some pointless code that was leaking.
2013-11-18 09:56:49 -06:00
Shyotl
2badc1c79c
Initialize LLListener_OpenAL::mRolloffFactor just to be safe.
2013-11-18 09:55:15 -06:00
Siana Gearz
3b8fbbc827
Clean up shaders on package and no longer final-package by default on Linux
2013-11-18 07:45:25 +01:00
Siana Gearz
a5103a1fc1
Sprinkle some Intel GPU support on Linux
2013-11-18 04:22:21 +01:00
Siana Gearz
749d0eec28
Merge https://github.com/abaph/SingularityViewer
...
Brings in support for MESA accelerators.
2013-11-17 16:38:06 +01:00
Latif Khalifa
0af470b2a9
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer
2013-11-17 12:45:32 +01:00
Latif Khalifa
97c505f941
Reset 'MotionResetsCamera' on camera reset
2013-11-17 12:45:14 +01:00
Latif Khalifa
c6ec2a531f
Alow alt-camming and terrian parcel selection from farther away.
...
Thanks to Liru for finding the sport
2013-11-17 12:28:06 +01:00
Drake Arconis
3e2f1a8fd9
Changed singularity prebuilt cache dir to sg.install.cache
2013-11-16 14:28:25 -05:00
Drake Arconis
7fa5abd4d1
Added NVAPI support on windows
2013-11-16 14:01:09 -05:00
Drake Arconis
924908f2ad
Imported new revoke anim perms code and refactored related bits
2013-11-15 19:51:21 -05:00
Aleric Inglewood
bddb1ba48c
Merge remote-tracking branch 'singu/master'
2013-11-15 18:00:49 +01:00
Aleric Inglewood
a8cded0cf6
Allow calling LLNotificationsUtil::add from any thread.
...
This makes LLStringUtil thread-safe by removing a rather unnecessary
LLFastTimer from LLStringUtil::format.
Same thing for LLTrans::getString and LLTrans::findString, where
even a comment stated that the author wasn't interested in measuring
cpu time at all. In this case I added some code back to make sure
that we're not calling LLTrans::getString() in an inner loop, which
was the reason that the LLFastTimer was added.
Made one string static to avoid 45000 look ups during login, which
kinda triggered the above test.
Finally, LLNotificationsUtil::add is made thread-safe by making
LLNotificationChannelBase::mItems thread-safe and defering a call
to LLNotifications::updateItem to the main thread when called
from another thread (using a little statemachine).
2013-11-15 17:52:52 +01:00
Latif Khalifa
14c43aa9a2
Fixed camera pan
2013-11-14 20:36:07 +01:00
Latif Khalifa
f273d3ff59
Singularity 1.8.4
2013-11-14 12:51:41 +01:00
Latif Khalifa
1bd78c5398
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-14 02:51:36 +01:00
Shyotl
fc4f0eaa82
Particle glow tweak excluded more faces from glow than intended.
2013-11-13 19:39:14 -06:00
Salvatore La Bua
8ad3b87c0e
Fix a render issue with Hightlight Transparent
...
The smoke texture is currently not applied to transparent objects.
This commit tweaks the red alpha overlay as a workaround for that.
2013-11-13 21:16:58 +01:00
Latif Khalifa
133dffb326
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-13 20:12:25 +01:00
Shyotl
01e27eac76
Kill a tiny bit of dead code.
2013-11-13 13:06:47 -06:00
Shyotl
d4a3cb168c
Altered the deferred alpha fragment shader to handle alphamasking when drawing avatar hair/skirts. (Special handling for these two seems weird, considering all other mesh parts are also alphamasked.. It also prevents skirts from casting shadows. Future alteration may be desired.)
2013-11-13 12:59:21 -06:00
Shyotl
f03376cd2a
Remove hack for nvidia on osx.
2013-11-13 12:53:43 -06:00
Inusaito Sayori
6bd9649277
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-11-13 13:03:27 -05:00
Damian Zhaoying
6e05e49a45
update spanish translations in strings.xml and floater_model_preview.xml files
2013-11-13 12:56:38 -03:00
Latif Khalifa
fcf061d06b
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-13 13:01:21 +01:00
Latif Khalifa
a3b232f389
Merge remote-tracking branch 'lightdrake/master'
2013-11-13 12:51:31 +01:00
Shyotl
3416b837dc
Added setting 'SHAlwaysSoftenShadows' to soften shadows when ssao isn't enabled. Removed a couple dead settings.
2013-11-13 02:31:55 -06:00
Shyotl
ba84bf1461
Avoid needless second pass on non-glow particles.
2013-11-13 02:27:01 -06:00
Shyotl
3ed249cba5
Retain cubemap reflection on shiny faces while in shadowed, but don't bloom the sun reflection.
2013-11-13 01:35:31 -06:00
Shyotl
584e5176a4
Err closer to LL regarding shadows, however also fixed alpha face shadows to look like all other shadows.
2013-11-13 01:30:45 -06:00
Drake Arconis
e5fcd54c92
Add option to disable scroll offset changing modifier
2013-11-12 23:47:28 -05:00
Damian Zhaoying
899a21ca24
Merge remote-tracking branch 'Liru/master'
2013-11-12 16:09:05 -03:00
Inusaito Sayori
29a07f4b5c
Actually fix the french translations (codepage borks yay) Thanks Nomade
2013-11-12 03:03:20 -05:00
Inusaito Sayori
2e7d80e9ba
Let shift-left-clicking in the middle of subpiemenus move back to the parent piemenu!
2013-11-12 02:02:16 -05:00
Inusaito Sayori
d678735cf6
Code cleanup in pie menu
...
Cleaned up hover logic and slice from x and y code duplication
(Best viewed without space changes)
2013-11-12 02:00:21 -05:00
Latif Khalifa
6b5875c008
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-12 02:00:53 +01:00
