Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,114 Commits 20 Branches 51 Tags
9c63243fe79324a728698fc8323fa02d2f607a36
Commit Graph

6114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siana Gearz
89ad14b82f Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-08-12 14:52:47 +02:00
Siana Gearz
73785af730 Fix permission panel unclickable 2012-08-12 13:33:27 +02:00
Siana Gearz
d2c3e50a3f Fix LLTrans for Unknown 2012-08-12 13:15:42 +02:00
Aleric Inglewood
2fbe7ab6ce Only accept pointers to valid types for getinfo(). 2012-08-12 03:38:45 +02:00
Aleric Inglewood
164799e4c4 Curl debug output improvements and minor fixes. 2012-08-12 03:33:33 +02:00
Siana Gearz
4f57269518 Fix show muted text in chat 2012-08-11 22:26:31 +02:00
Lirusaito
92c9311a4c gpu_table update! 2012-08-11 02:51:49 -04:00
Lirusaito
ca6fd89700 Initial gpu_table retabbing, nothing important. 2012-08-11 01:49:15 -04:00
Lirusaito
80b100f135 Fix "KeyError: 'extra_libraries'" when compiling without FMOD Ex. 2012-08-11 00:48:36 -04:00
Lirusaito
8e12f11089 Forgot to commit this include 2012-08-11 00:09:09 -04:00
Lirusaito
f4324e8890 Merge branch 'future' of git://github.com/Lirusaito/SingularityViewer 
Conflicts:
	indra/llrender/llpostprocess.cpp
 2012-08-10 23:39:06 -04:00
Lirusaito
fda34fea46 Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer 2012-08-10 23:30:56 -04:00
Lirusaito
0770150455 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-08-10 23:30:16 -04:00
Lirusaito
d79a8fc87b Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2012-08-10 23:27:42 -04:00
Aleric Inglewood
8e1bbfe938 Amend last commit 2012-08-11 03:29:46 +02:00
Aleric Inglewood
3469d65f95 Windows compile and linker fixes. 
* Do not include aithreadid.h from debug.h, because the latter is
  included everywhere (from linden_common.h) and aithreadid.h is
  heavy (includes among others windows.h).
* On windows, thread local members cannot be exported.
 2012-08-11 03:23:31 +02:00
Lirusaito
486536f92d Allow antispam time to be set to 0, for disabling Antispam. 2012-08-10 18:41:50 -04:00
Aleric Inglewood
70717cb6c8 Compile bug fix for windows. 2012-08-10 14:49:34 +02:00
Aleric Inglewood
94ebcdeb6b Add eight missing headers... 
How did you ever get this to compile if those
headers were removed from the precompiled header?
 2012-08-10 07:23:29 +02:00
Aleric Inglewood
152238e67f Merge remote-tracking branch 'shyotl/breakforce' into breakforce 2012-08-10 05:56:28 +02:00
Shyotl
eef51e0bd0 Pulled llpacketring.h and llhttpclient.h out of the precompiled header. 2012-08-09 22:50:05 -05:00
Aleric Inglewood
91df8446b0 Oops bug fix for last commit. 2012-08-10 05:37:41 +02:00
Aleric Inglewood
ffb55f482a Compile fixes for windows. 2012-08-10 05:35:11 +02:00
Aleric Inglewood
b2c5a84964 Replace CURLOPT_POSTFIELDSIZE_LARGE with CURLOPT_POSTFIELDSIZE 
Also adds a more robust interface for setopt that does
type checking based on the options used. This fixes one
bug where a F32 was passed and interpreted as long.
In many cases a U32 or S32 was passed as long, which
would fail (only) on a 64bit non-windows big endian machine.
 2012-08-10 04:18:04 +02:00
Drake Arconis
0be43cf1c2 Fixed GCC47 issues and fmodex copying 2012-08-09 10:56:29 -04:00
Siana Gearz
f5923860fa Remove maximum selection limit of 20 friends, no longer present in viewer 2/3 2012-08-09 15:39:22 +02:00
Siana Gearz
adc2921f38 Fix push to talk lock 2012-08-09 15:28:04 +02:00
Siana Gearz
ca630a106e Merge fix 2012-08-09 15:21:38 +02:00
Drake Arconis
cbbc42d564 Merge remote-tracking branch 'singularity/master' into AltCompilers 2012-08-09 08:44:14 -04:00
Aleric Inglewood
0054e6a378 Bug fix. 
Fixes an exit crash when the user clicks on Login and immediately
on Quit, because termination of the LLAuth curl request statemachine
access the CurlRequestTimeOut debug setting.
 2012-08-09 07:04:23 +02:00
Aleric Inglewood
76e30150b9 Removed superfluous debug output 2012-08-09 07:02:42 +02:00
Aleric Inglewood
cd197a3807 Fix LL_REF_COUNT_DEBUG debug code. 
This code was broken with respect to LLAPRPool.
Fix that, and also fixed it for the new AIThreadID API.
 2012-08-09 07:00:51 +02:00
Aleric Inglewood
b9673df961 Clean up of debug.h: just use LL_COMMON_API. 2012-08-09 06:57:53 +02:00
Aleric Inglewood
37c8ea54eb Add AIThreadID - Cleanup of apr_os_thread* related code. 
Apart from just really cleaning things up and moving
everything into one class regarding thread IDs (ie,
is_main_thread(), comparing ID's etc), this also
fixes an obscure bug where LL was casting thread ID's
to U32 and then compared those to find out if it
the same thread. It's theoretically possible that
such fails on a 64bit OS.

By generalizing the interface, I adopted the use
of a thread-local cache for the current thread ID
as used by LLMutex et al, so now all code benefits
from that. The idea was even extended to now also
be used for is_main_thread() tests and even resetting
a thread ID to the ID of the current thread.
 2012-08-09 06:30:31 +02:00
Siana Gearz
e616b40c6f Autodetect music stream type properly 2012-08-09 05:09:02 +02:00
Siana Gearz
26109ca8f9 Assert fix 2012-08-09 04:50:48 +02:00
Siana Gearz
46e57d4f1c Package FMOD Ex on Linux 2012-08-09 03:46:24 +02:00
Siana Gearz
7743843a27 Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer 
Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
 2012-08-09 03:46:03 +02:00
Siana Gearz
c84e145557 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp
 2012-08-09 02:11:14 +02:00
Drake Arconis
e767392b44 Merge remote-tracking branch 'shyotl/future' into AltCompilers 
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/llvovolume.cpp
 2012-08-08 18:54:04 -04:00
Drake Arconis
457177905d Merge remote-tracking branch 'singularity/master' into AltCompilers 2012-08-08 18:50:03 -04:00
Siana Gearz
de74443d76 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml
 2012-08-09 00:42:23 +02:00
Siana Gearz
f3e7340118 Merge branch 'shycurl' of github.com:singularity-viewer/SingularityViewer 
Conflicts:
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
 2012-08-09 00:02:50 +02:00
Lirusaito
efe3dd77fa Address Issue 91: Estate ban button added to radar 
Shift-Enter in radar now starts an IM with people selected.
Also, it seems Dark used black for texts and should... so... let's reverse that change.
 2012-08-08 15:51:26 -04:00
Damian Zhaoying
7c690b9de1 Merge remote-tracking branch 'upstream/master' 2012-08-08 12:56:07 -03:00
Lirusaito
5ce8770dc3 Fix Issue 304: export texture in png too 
code adapted from that bird that burnt to death...
 2012-08-08 10:50:17 -04:00
Damian Zhaoying
e9ddd6b8f8 Merge remote-tracking branch 'upstream/master' 2012-08-08 01:03:49 -03:00
Aleric Inglewood
f94f458922 Print CURL_SOCKET_TIMEOUT for that particular value. 2012-08-08 04:10:34 +02:00
Aleric Inglewood
89ef06fd3f Compiler warning fixes. Take into account that debug_libcurl.cpp is no longer linked dynamically. 2012-08-08 01:58:49 +02:00
Aleric Inglewood
ccd135b2a6 and again 2012-08-08 01:04:27 +02:00