Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,750 Commits 20 Branches 51 Tags
83fb898852dd6b0ccc9b0e3ce213601dc61394da
Commit Graph

3750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleric Inglewood
83fb898852 Bug fix: Wake up curl thread at exit of viewer. 2013-02-03 17:24:26 +01:00
Aleric Inglewood
d055494706 Libcwd compile fixes 
include linden_common.h first (is already included through the used
headers).
 2013-02-01 21:26:08 +01:00
Latif Khalifa
5cbe633117 Fixed compile under older GCCs by Siana Gearz 2013-02-01 00:18:01 +01:00
Latif Khalifa
719ea47a35 Merge remote-tracking branch 'lirusato/Canon' 2013-01-31 17:21:08 +01:00
Latif Khalifa
70eeddabba Merge remote-tracking branch 'shyotl/sunshine' 2013-01-31 17:20:58 +01:00
Lirusaito
d756225684 Minimal change to fix folder->Add Items, purgeCategory wasn't supposed to be called in this case. 2013-01-31 02:41:17 -05:00
Shyotl
26de17f2de Avoid occasional DoF-related crash upon region disconnection. 2013-01-30 22:04:57 -06:00
Shyotl
be0d751334 Cleanup, further hardening of namecache callbacks, and update to avatar picker. 2013-01-30 22:04:04 -06:00
Latif Khalifa
4b0bac34dd Added the ability to have the voice enabled in multiple viewer instances 2013-01-31 01:26:39 +01:00
Latif Khalifa
4e29b6752e Fixed packaging of the mac build 2013-01-30 14:17:16 +01:00
Latif Khalifa
046735f043 Merge remote-tracking branch 'upstream/exp' 2013-01-30 05:49:45 +01:00
Latif Khalifa
a9b05fd029 Merge remote-tracking branch 'lirusato/master' 2013-01-30 05:48:45 +01:00
Latif Khalifa
5c8e436401 Fix windows build: warnings management 2013-01-30 05:45:00 +01:00
Latif Khalifa
4d805da6ac Package glod and colladadom dlls 2013-01-30 05:43:17 +01:00
Latif Khalifa
085800f6e0 Tell the compiler we are using colladadom dll, and not a static lib. Use our current boost libs 2013-01-30 05:27:10 +01:00
Latif Khalifa
1934fc9bd4 Temporarily disable HACD file save functions (not used) to avoid strange linking issue on windows 2013-01-30 05:25:05 +01:00
Latif Khalifa
8c1848b487 Silence secure CRT warnings when building HACD 2013-01-30 05:14:48 +01:00
Latif Khalifa
8edb10fb88 Merge remote-tracking branch 'aleric/meshupload' into meshupload 2013-01-30 05:12:04 +01:00
Aleric Inglewood
8aecc49456 Add missing notifications. 2013-01-30 03:58:42 +01:00
Latif Khalifa
b8919c21d8 Merge remote-tracking branch 'aleric/meshupload' into meshupload 2013-01-30 03:46:45 +01:00
Aleric Inglewood
9203b24eb9 Remove AIStateMachineThreadBase* argument from AIThreadImpl constructor. 
Also removes the use of 'this' to initialize base classes, which led to
a compiler warning on vs2010.
 2013-01-30 03:44:02 +01:00
Latif Khalifa
8584e6da4c Merge branch 'master' into meshupload 
Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h
 2013-01-30 00:36:31 +01:00
Aleric Inglewood
1d673df1bd Add AIMeshUpload and fix LLMeshUploadThread 
* Removes polling stuff (call to gMeshRepo.update()) which did
  nothing but check if uploads already finished.
* Just creates and runs the state machine (AIMeshUpload) instead
  of creating an LLThread derived class (LLMeshUploadThread) and
  adding that to a queue, then have the main thread start it
  after adding it to another queue in order to keep track of
  the instances (both queues are gone).
* mWholeModelUploadURL was moved to the state machine, because
  it needs a life time till the responders finishes (can't be
  part of the thread object).
* LLMeshUploadThread is now derived from AIThreadImpl instead
  of LLThread, so it can be run in a state machine thread.
* The call to LLHTTPClient::post is now done from the main
  thread instead of from the thread, but I don't think that is
  a problem.
 2013-01-29 23:42:06 +01:00
Aleric Inglewood
b3adf71ed7 Remember floater rectangle 2013-01-29 23:20:02 +01:00
Aleric Inglewood
7ba0b6482c Fix example code. 2013-01-29 20:49:53 +01:00
Aleric Inglewood
e99175444f Bike fix: Always set mStatus to STOPPED 2013-01-29 20:45:08 +01:00
Aleric Inglewood
d5ed31ca9b Allow passing a name to underlaying LLThread in debug mode. 2013-01-29 20:44:14 +01:00
Aleric Inglewood
1c8027b1e6 Add statemachine parent callback support to LLHTTPClient::post 2013-01-27 22:02:19 +01:00
Aleric Inglewood
ebac80b5b7 Fix termination race condition. 2013-01-27 20:52:21 +01:00
Siana Gearz
4cab6a89a9 1024-sized terrain texture support 2013-01-27 06:06:13 +01:00
Siana Gearz
50a360d314 Silence voice complaint about missing cap 2013-01-27 04:42:00 +01:00
Lirusaito
4e96dccd7c Fix Issue 385: Group chat announces in window not in Instant message 
Improved Ignore Group functions
Best viewed without space changes.
 2013-01-26 21:47:32 -05:00
Siana Gearz
7755033017 Lazily fix static deinitialization fiasco 2013-01-27 01:43:38 +01:00
Siana Gearz
aed472af77 Try to fix long-standing crash-on-resize in Linux. 
It appear's SDL's SetVideoMode can cause repeat SDL_VIDEORESIZE message and shouldn't be called again.
 2013-01-27 01:41:17 +01:00
Aleric Inglewood
c528a15e95 Added AIStateMachineThread 2013-01-26 19:19:09 +01:00
Aleric Inglewood
6dc4a60724 Changes to LLThread 
* Call a virtual terminated() that by default sets mStatus to STOPPED,
  instead of setting it to STOPPED directly, allowing to override
  the behavior of a LLThread derived class when the thread is about
  the exit.
* Make setQuitting() public, so it can also be used to hint to a
  thread that it should stop at its earliest convience.
 2013-01-26 19:15:57 +01:00
Aleric Inglewood
f6785c399d Added support for LLCondition to AIThreadSafeSimple. 2013-01-26 18:35:42 +01:00
Latif Khalifa
237f84cde0 Merge remote-tracking branch 'shyotl/sunshine' 2013-01-26 13:49:50 +01:00
Shyotl
485ad8e645 Reworked name loading for vivox speaker list. LLSpeaker now boost::signals2::trackable to avoid accessing after destruction. Opening new sessions via doubleclick on list(sessions managed by legacyname) or using the mute button(legacyname needed to exclude lindens) are both disabled until namecache lookup complete. 2013-01-26 01:57:13 -06:00
Lirusaito
1582bf43c5 Allow RLVa Z Offset and Vanity Body Dynamics Offset to coexist. 2013-01-25 11:26:52 -05:00
Aleric Inglewood
a1fa43850b Comment fixes. 2013-01-25 16:09:34 +01:00
Latif Khalifa
5e799b1f81 Respect always rez under owned land group setting for objects 
duplicated by shift-dragging or duplicating.

Based on Phoenix changeset 5b50018c63d4 by Kadah
 2013-01-23 12:02:04 +01:00
Aleric Inglewood
0296812e88 Add cmake file for collada and glod. 
This fixes standalone when those libraries are installed
elsewhere. Note that it "breaks" standalone if you just
installed the prebuilt manually. For that to work you
have to add /.../libraries/include to CMAKE_INCLUDE_PATH,
which is not recommended because it would pick up any
other prebuilt over your system installed libraries.

Instead, for standalone, install the libraries somewhere
with some prefix and then add that prefix to the environment
variable CMAKE_PREFIX_PATH.

For example, $prefix/include/collada and $prefix/lib/libcollada4dom.so
 2013-01-22 20:51:43 +01:00
Latif Khalifa
d8c846288e Merge remote-tracking branch 'lirusato/master' 2013-01-22 20:06:03 +01:00
Lirusaito
dd1e9a68d4 Removal of the deprecated lltabcontainervertical. 2013-01-22 01:38:25 -05:00
Lirusaito
21860ded90 Support web_profile_url response from OSGrid servers for setting WebProfileURL 2013-01-21 21:27:53 -05:00
Lirusaito
48113f8506 AuroraSim: HippoLimits and HippoGridManager update, and support for Aurora's MaxDrag 2013-01-21 21:22:04 -05:00
Aleric Inglewood
db7155666d Merge branch 'master' into meshupload 
Conflicts:
	indra/cmake/00-Common.cmake

One diff added /MP to CMAKE_CXX_FLAGS_DEBUG while
another removed /arch:SSE2 from the same line.

Fixed to honor both changes.
 2013-01-21 19:16:06 +01:00
Latif Khalifa
b758014ebc Adjust to recent change in the API for Responder objects 2013-01-21 11:25:32 +01:00
Latif Khalifa
18816ae146 Merge remote-tracking branch 'shyotl/sunshine' 2013-01-21 11:25:10 +01:00