Commit Graph

5494 Commits

Author SHA1 Message Date
Shyotl
66ebe45b5e Give 'gDeferredNonIndexedDiffuseAlphaMaskProgram' a unique 'name' 2014-01-23 19:01:49 -06:00
Shyotl
7516871b16 Avoid wasting particles on incredibly small/zero length ribbon segments. 2014-01-23 19:00:30 -06:00
Shyotl
3da9fe0e94 Avoid calling a few deprecated gl functions when shaders are enabled. 2013-12-25 02:09:36 -06:00
Shyotl
75f94d346d Fixed Alerics favorite assertion. 2013-12-24 20:21:55 -06:00
Shyotl
4eb9dc5191 Use GL_STREAM_DRAW_ARB for post-process fullscreen quad. 2013-12-24 20:17:05 -06:00
Shyotl
e00e704cbd Fix minor error in shader which prevented ssao from working with shadows enabled. 2013-12-24 20:16:05 -06:00
Shyotl
033880c8f9 Kill some vertex attribute / shader attribute inconsistencies. (Issue 1287, 1281) Also hopefully improved face edit overlay behavior when editing normal/specular texture/scale/offset/rotation. 2013-12-24 20:15:29 -06:00
Shyotl
9014d56957 Fix 'setBuffer: Shader consumption mismatches data provision.' error in LLPipeline::updateCull. Issue caused by LLDrawPoolAlpha not unbinding shaders when only basic shaders are enabled. https://code.google.com/p/singularity-viewer/issues/detail?id=1281 2013-12-13 02:21:54 -06:00
Shyotl
7da8b012e6 Pulled SSAO out into its own shader to support running at a lower-than-native framebuffer resolution (defaults at half-resolution [SHRenderSSAOResolutionScale=.5] ). This doesn't improve the slow ssao/shadow softening, however, as that bit remains unchanged. 2013-12-13 02:19:57 -06:00
Shyotl
78e3d61b98 Remove ambient occlusion darkening from all deferred shaders except the one that actually calculates occlusion values.. (aka every shader except class2/softenLightF.glsl) 2013-11-28 21:07:25 -06:00
Siana Gearz
9c29488044 If the text is too skinny to render, don't crash 2013-11-20 10:33:15 +01:00
Siana Gearz
060628397b Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2013-11-20 05:50:03 +01:00
Siana Gearz
f23dc157be Prevent accidental modification of vital stock grid 2013-11-20 05:49:43 +01:00
Shyotl
3715b7439d Doer fonts fast(er)! (better batching for font glyph rendering) 2013-11-19 19:40:29 -06:00
Siana Gearz
cde5b23353 Limit avatar physics to 20-40 simulation steps per second to avoid wonky integration 2013-11-20 02:22:16 +01:00
Siana Gearz
07736106b1 Suppress asserts in fallback font loading 2013-11-20 02:20:58 +01:00
Siana Gearz
01744730a1 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer 2013-11-20 01:11:13 +01:00
Siana Gearz
c162b470b2 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2013-11-20 01:09:10 +01:00
Shyotl
5d2511e39e More font cleanup and updating. 2013-11-19 17:56:27 -06:00
Aleric Inglewood
ea0e25b92b Make entering a Login URI in the grid manager more robust.
Before, when anything but the exact correct Login URI was entered, the
user would either get no error, or a pop up saying "Cannot retrieve grid
info from server."

With this patch, that pop up includes what went wrong and stresses that
they check if they entered the correct Login URI and where to find it.

I was motivated to write this after looking at crash report 8405 where
a user who had downloaded Singularity for the very first time crashed
twice when entering things like "aviworlds" and " aviworlds.com:8002"
(not the space), and "http:aviworlds.com:8002" (missing '//').

Especially in the light of FS accepting Login URI without the 'http://',
a lot of grid websites (like that of aviworlds) might instruct users
to enter the url without http://. Ie, this user was told to enter
just "aviworlds.com:8002", and when that failed was instructed to
add 'http' in front of it...

Now the code accepts also really WEIRD things, but will never mess
up a good entry. For example, if you enter "pssshht:aviworlds.com:8002"
then that will work, as a side effect. The real objective however is
of course to let things work like: "aviworlds.com:8002  ",
"http:aviworlds.com:8002", " http:/aviworlds.com:8002", and to give
a usable error message when there is a typo in the hostname (Cannot
resolve hostname) or they forget to add a port number (404, or
connection refused), plus the text "Make sure you entered the correct
Login URI. An example of a Login URI is: \"http://cool.grid.com:8002/\",
this url can usually be found on the website of the grid."
2013-11-19 22:00:34 +01:00
Aleric Inglewood
06bebcc5c4 Bug fix for BlockingResponder.
Blocking http requests (code using responders derived from
BlockingResponder) *do* call getRaw() and getLLSD to get the body of
server error messages. It is therefore perfectly ok if mStatus !=
HTTP_OK.
2013-11-19 21:16:12 +01:00
Aleric Inglewood
63a6ed4f43 Fix floater xmls: tooltip must be tool_tip. 2013-11-19 20:26:55 +01:00
Latif Khalifa
26ca140e4b Fixed symbol generation on Mac with channel specific packages 2013-11-19 08:47:18 +01:00
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