Commit Graph

6186 Commits

Author SHA1 Message Date
Latif Khalifa
c3226b25fe Fixed Windows build 2013-10-10 00:18:47 +02:00
Latif Khalifa
d98402b13f Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/llvotree.h
2013-10-10 00:03:36 +02:00
Latif Khalifa
b2979ca3a4 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-10 00:01:56 +02:00
Shyotl
7a913af2c7 Use camera enums instead of magic numbers. 2013-10-09 16:09:09 -05:00
Shyotl
e324ffd9ad In render_disconnected_background don't bind a shader or flush unless a disconnect image is actually being drawn. 2013-10-09 16:05:15 -05:00
Shyotl
e96caa78a1 Removed a little bit of unnecessary code from pipeline.cpp 2013-10-09 15:45:33 -05:00
Shyotl
b6bf5545c9 Change lightfunc from GL_R8 to GL_R16F/R32F 2013-10-09 15:44:15 -05:00
Shyotl
f25eb07fab Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation. 2013-10-09 15:43:23 -05:00
Adeon Writer
9f6b89ff18 Don't shorten avatar skeleton while in mouselook 2013-10-08 18:17:51 -04:00
Damian Zhaoying
24463b7d04 update panel_login.xml and menu_minimap.xml files and fix labels in master language file menu-minimap.xml to make translations works 2013-10-08 17:49:52 -03:00
Aleric Inglewood
909be9e169 Add AITESTPLUGIN
Usage:

nc -l -p 61916
AITESTPLUGIN=1 LL_WRAPPER='gdb --args' ./singularity

Then paste into nc:

<llsd>
    <map>
        <key>class</key>
            <string>internal</string>
        <key>name</key>
            <string>load_plugin</string>
        <key>params</key>
            <map>
                <key>dir</key>
                    <string>/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/viewer-linux-x86_64-debug/newview/packaged/bin/llplugin</string>
                <key>file</key>
                    <string>/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/viewer-linux-x86_64-debug/newview/packaged/bin/llplugin/libbasic_plugin_filepicker.so</string>
            </map>
    </map>
</llsd>

and press control-v control-shift-2

Where the path should match the library you want to load.
2013-10-08 15:34:22 +02:00
Drake Arconis
010723eea6 Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2013-10-07 23:24:04 -04:00
Drake Arconis
a4fa66655e Unbreak OSX Make File builds 2013-10-07 23:23:51 -04:00
Drake Arconis
610f7ac5de Fix a Clang error 2013-10-07 23:23:40 -04:00
Adeon Writer
be10c2d7fb Focus depth of field under cursor in flycam 2013-10-07 22:28:26 -04:00
Aleric Inglewood
e3ce473639 Compiler warning fix.
My guess is that this fixes the warning:

/singularity/singularity-master/indra/newview/llfloaterdirectory.cpp: In
function ‘void* createWebPanel(void*)’:
/singularity/singularity-master/indra/newview/llfloaterdirectory.cpp:167:
warning: ‘createWebPanel(void*)::LLPanelDirWeb’ declared with
greater visibility than the type of its field
‘createWebPanel(void*)::LLPanelDirWeb::<anonymous>’
/singularity/singularity-master/indra/newview/llfloaterdirectory.cpp:167:
warning: ‘createWebPanel(void*)::LLPanelDirWeb’ declared with
greater visibility than its base ‘LLPanelDirFind’

That I see in https://files.streamgrid.net/singularity/linux-i686.log
2013-10-08 02:06:28 +02:00
Drake Arconis
008eac5a8d Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2013-10-07 17:46:37 -04:00
Damian Zhaoying
08dd2f72ec Merge remote-tracking branch 'Liru/master' 2013-10-07 14:22:25 -03:00
Latif Khalifa
c7ff14f224 Address issue #1128 2013-10-07 17:06:14 +02:00
Latif Khalifa
942f4ce225 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-07 16:59:20 +02:00
Latif Khalifa
7aed929af5 Attempted fix in Linux build and Linux32 packaging 2013-10-07 15:11:54 +02:00
Inusaito Sayori
99f81daa99 Feature Request: Add a debug setting, LiruLegacyLogLaunch, to use the old, non-browser method to open chat logs. 2013-10-07 05:43:56 -04:00
Drake Arconis
a1751dcc1e Warning fix 2013-10-06 22:55:30 -04:00
Drake Arconis
817c01595f I really really hate you microsoft. More windows sdk cmake poke 2013-10-06 22:55:21 -04:00
Drake Arconis
128503fd7f Attempt to fix linking issues 2013-10-06 22:54:38 -04:00
Sean Devin
cf100fc36c Do not use pcre on linux64
Conflicts:
	indra/newview/viewer_manifest.py

Merged with a patch that I wrote.

The linux pcre prebuilts can also be removed from install.xml,
but for now leaving them there because the prebuilts are still
in use by the libcollada prebuilt (probably should just move
them into that git repository).
2013-10-06 21:56:11 +02:00
Aleric Inglewood
64513e7229 Fix boost upgrade for standalone 2013-10-06 19:42:58 +02:00
Aleric Inglewood
8262e899f8 Merge remote-tracking branch 'singu/master' 2013-10-06 17:11:58 +02:00
Latif Khalifa
a1c43e3539 Fixed mac build. How the heck did this get there? 2013-10-06 16:34:56 +02:00
Andros Baphomet
7ab20726e4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	indra/llrender/llshadermgr.cpp (resolved)
2013-10-06 10:32:23 -04:00
Aleric Inglewood
f7614dced3 Fix possible problem with negative mQueuedCommands
mQueuedCommands was unsigned, but can become shortly negative.
Unfortunately this means I had to remove the assert that
keeps track of possible errors, but I believe that already
has been proven that it works anyway.

The reason it can become negative is because its meaning is
"Number of added ADD (request) commands minus number of REMOVE (request)
commands". Hence, it is incremented when an ADD command is added to the
queue and decremented when that ADD command is removed from the queue.
However, it is first decremented when a REMOVE command is added to the
queue and then incremented again when that REMOVE command is removed
again from the queue. Such a remove command is current extremely rare:
it only happens when curl fails to time out - and the backup timeout of
the statemachine fires after 10 minutes of a curl request being idle.
That should normally only happen if a request never reached curl of
course, and is queued in the curl thread, waiting to be added to curl,
aka: -0-0-1,{...} for 10 minutes...

Now that, in turn should be impossible (since the "don't count long poll
connections) unless the Curl* Debug Setting variables are changed to
wrong values.. but ok, can only guess here.
2013-10-06 15:27:40 +02:00
Aleric Inglewood
cfad646748 Removed left over debug output. 2013-10-06 11:54:11 +02:00
Latif Khalifa
85f4fa9000 Merge branch 'boost152' 2013-10-06 08:13:31 +02:00
Latif Khalifa
dd680f27d4 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-06 08:13:11 +02:00
Latif Khalifa
2c091a954f Breaking pad: try to send the correct log file 2013-10-06 08:12:17 +02:00
Latif Khalifa
26f4c4a773 Boost throws exceptions 2013-10-06 08:11:07 +02:00
Latif Khalifa
ee007f322b Rebuilt Collada with new boost from https://github.com/singularity-viewer/3p-colladadom/commits/singularity 2013-10-06 07:50:38 +02:00
Latif Khalifa
aece3c7069 Don't copy pcre on linux64 2013-10-06 07:49:38 +02:00
Latif Khalifa
9f0af64963 More boosted fun 2013-10-06 01:55:12 +02:00
Inusaito Sayori
337c0d9cbb [Warnings] Remove warning suppressions for colladadom
I have fixed the warnings internally, so this wraps up my work
But our colladadom source and our prebuilds must be updated with my changes before this change is tolerable
2013-10-05 19:02:17 -04:00
Inusaito Sayori
4423bef896 [Warnings] Reduce collada includes to bare minimum to lessen Mac warnings 2013-10-05 18:33:07 -04:00
Inusaito Sayori
23e72f3978 [Warnings] Fix signed/unsigned mismatches rather than disabling 4018 2013-10-05 18:23:13 -04:00
Andros Baphomet
f6861cd5ba Fix shader compilation/out-of-spec issues 2013-10-05 17:33:34 -04:00
Andros Baphomet
988009d84d Don't explicitly set LIBGL_DRIVERS_PATH by default; breaks autodetection 2013-10-05 17:32:42 -04:00
Latif Khalifa
200b812182 Link boost statically 2013-10-05 22:09:54 +02:00
Latif Khalifa
4118afc146 Boost upgrade to 1.52 2013-10-05 20:27:20 +02:00
Aleric Inglewood
034ff0a305 Fix google breakpad for standalone.
The normal usage is to include the src/ directory of google breakpad
in your application and then include client/ARCH/handler/exception_handler.h
where ARCH is windows, mac or linux.

However, Linden Lab for some reason packaged the breakpad prebuilt
with exception_handler.h installed in ../google_breakpad/exception_handler.h
where "../google_breakpad" is the 'root' of the include tree comparable
with 'src' in the source tree of google breakpad.

Hence, instead of including 'src' one now must include '../include/google_breakpad'
which was already done correctly for non-standable, but not for
standalone (BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR was set to '../include'
with the 'google_breakpad' and is subsequently never used: instead
BREAKPAD_INCLUDE_DIRECTORIES is used (which is set for non-standalone)).

Therefore one much not include "google_breakpad/exception_handler.h",
but just "exception_handler.h" or you rely on somehow the directory
*below* BREAKPAD_INCLUDE_DIRECTORIES to be part of the include path as
well.

Finally LL packages the prebuilt if another duplicate minidump_descriptor.h
in the include root. Also here including "minidump_descriptor.h" would
be better correct, but following the instructions by Google this time
we might as well include the original "client/linux/handler/minidump_descriptor.h".

My repo (http://github.com/AlericInglewood/3p-google-breakpad) doesn't
even put minidump_descriptor.h in the root anymore, only
exception_handler.h. The rest is an exact copy of the 'src' tree with
regard to the headers.

Tested to compile both standalone and non-standalone.
2013-10-05 19:44:37 +02:00
Inusaito Sayori
eeeca2197e Revert "Harden agains network packet overruns"
This reverts commit 6c1ea557b5.
2013-10-05 04:31:57 -04:00
Inusaito Sayori
16a8b92d84 [OpenSimExtras] Added callback setters to for the new chat ranges
Though they're not in use yet.. they should be in use soon, either way should exist.
2013-10-05 03:39:59 -04:00
Inusaito Sayori
de1a459bcb [OpenSimExtras] Variable chat ranges viewer awareness, thanks Diva Canto!! 2013-10-05 03:20:25 -04:00