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

3973 Commits

Author SHA1 Message Date
Melanie
6addfdfd93 Small bug fix - this could never work 2013-04-23 03:23:14 +02:00
Melanie
72db1a02b7 Fix audio the proper way 2013-04-23 03:16:31 +02:00
Melanie
ba6b2ef865 Revert "Add the new audio init code (experimental)" 
This reverts commit 1bc887f887.
 2013-04-23 03:15:59 +02:00
Melanie
df16ef39c5 Merge branch 'master' into Avination-4.0 2013-04-22 23:47:57 +02:00
Melanie
6296b5157b Limit the number of texture fetchers to two for Avination as this gives a better user experience (less timeouts) with AVN server side throttling. 2013-04-22 23:47:41 +02:00
Melanie
a4032e5e70 Add the option to dynamically enable/disable controls to the octopus 2013-04-22 23:47:34 +02:00
Melanie
7923323031 Limit the number of texture fetchers to two for Avination as this gives a better user experience (less timeouts) with AVN server side throttling. 2013-04-22 23:46:28 +02:00
Melanie
1934e49f99 Add the option to dynamically enable/disable controls to the octopus 2013-04-22 23:45:56 +02:00
Melanie
1b15b5bf5d Stage one of the new "change clothing" function. Introcuce an easy way to add generic packet handlers. 2013-04-22 15:02:23 +02:00
Melanie
1bc887f887 Add the new audio init code (experimental) 2013-04-21 05:55:47 +02:00
Melanie
cfe5236263 Remove info spam for empty event queue response - those can happen on opensim and we don't really need to know. 2013-04-21 05:55:15 +02:00
Melanie
fa5dba63dc Merge branch 'master' into Avination-4.0 2013-04-21 03:35:54 +02:00
Melanie
c216e75d23 Fix a duplicate element name (copypasta error) 2013-04-21 03:31:38 +02:00
Melanie
3f6e0580af Disable HTTP throttling for Avination as it's done serverside there 2013-04-21 03:31:29 +02:00
Melanie
fb781ab8f2 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-04-21 03:31:16 +02:00
Melanie
c38eb88915 Disable HTTP throttling for Avination as it's done serverside there 2013-04-21 03:30:27 +02:00
Melanie
43179bf853 Fix a duplicate element name (copypasta error) 2013-04-20 20:27:41 +02:00
Siana Gearz
e484904e3b Version 1.8.0 2013-04-20 14:44:01 +02:00
Siana Gearz
24047c933a No longer stall to death on unreadable streams 2013-04-20 13:27:32 +02:00
Latif Khalifa
41fba80cb5 More french translation updates 2013-04-20 08:51:15 +02:00
Melanie
11ba4d0d7d Merge branch 'master' into Avination-4.0 2013-04-20 08:08:53 +02:00
Melanie
3075429bca Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-04-20 08:08:40 +02:00
Latif Khalifa
abc60bb235 Merge remote-tracking branch 'shyotl/master' 2013-04-20 08:06:04 +02:00
Shyotl
c9f93a82ce Improved the logic in LLPipeline::updateDrawableGeom a bit. 2013-04-20 01:02:40 -05:00
Shyotl
39c4d9ad50 Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git 2013-04-20 01:01:26 -05:00
Shyotl
2121e78b45 Lessen occurrence of missing prims. Also added 'ctrl-shift-v' to rebuild vbos. 2013-04-20 01:00:24 -05:00
Melanie
37f3695e78 Merge branch 'master' into Avination-4.0 2013-04-20 06:40:51 +02:00
Melanie
1849b5ba1e Add isAvination() function to hippo grid manager 2013-04-20 06:40:16 +02:00
Latif Khalifa
2580aad939 Re-apply saphira's Linux build patch that somehow got lost in merges 2013-04-20 05:26:47 +02:00
Aleric Inglewood
368d675f24 Compile warning fix. 2013-04-20 05:07:44 +02:00
Aleric Inglewood
55a676e85d Compile warning fix. 2013-04-20 05:04:07 +02:00
Aleric Inglewood
8d028e6948 Fix for AIStateMachineThread (LLThreadSafeRefCount: deleting non-zero reference) 
This fixes
https://code.google.com/p/singularity-viewer/issues/detail?id=736

The problem was that we need to keep the 'user' derived THREAD_IMPL
alive in the thread, and therefore used an LLPointer<THREAD_IMPL>
(as base class of AIStateMachineThread<THREAD_IMPL>), and therefore
THREAD_IMPL, derived from AIThreadImpl had to be derived from
LLThreadSafeRefCount. However, AIStateMachineThread<THREAD_IMPL> also
needed to be a statemachine of itself and is derived from
AIStateMachineThreadBase derived from AIStateMachine which is ALSO
derived from LLThreadSafeRefCount - that in this case wasn't really
needed. An attempt to deactive it by calling ref() from the constructor
of AIStateMachineThreadBase failed on the fact that LLThreadSafeRefCount
insists that its ref count mRef is exactly zero when it is being
deleted.

The chosen solution is to remove the ref count from AIThreadImpl and use
the LLThreadSafeRefCount base class of AIStateMachineThreadBase. The
result is that not only THREAD_IMPL, but also the state machine object
is kept alive, but that doesn't seem like a problem.

Thus, instead of passing a AIThreadImpl* to
AIStateMachineThreadBase::Thread, we now pass a
AIStateMachineThreadBase* to it to keep the whole of the
AIStateMachineThread<THREAD_IMPL> object alive, which has a THREAD_IMPL
as member now. This member then can be accessed through a virtual
function impl(). Another result of this change is that the 'user' (the
class derived from AIThreadImpl, THREAD_IMPL) now has to deal with the
LLPointer, and use LLPointer<AIStateMachineThread<THREAD_IMPL> >
instead of just AIStateMachineThread<THREAD_IMPL> and also allocate
this object himself. The access from there then changes into a -> to
access the state machine (as opposed to a .) and ->thread_impl() to
access the THREAD_IMPL object (as opposed to a ->).
 2013-04-20 04:54:25 +02:00
Latif Khalifa
70eb45e923 Revert "TEMPORARILY disable erroring out during mesh upload" 
This reverts commit 3bdeb8e8a8.
 2013-04-20 04:53:44 +02:00
Latif Khalifa
7b42ad5e2a Demote assert and allow UDP fallback in case COF fetching times out 2013-04-20 04:49:18 +02:00
Latif Khalifa
f6f505d487 Merge remote-tracking branch 'shyotl/master' 2013-04-20 04:29:59 +02:00
Shyotl
91db5a854f Wrap std::filebuf to work with unicode filepaths on Windows. (Use UTF-16) 2013-04-19 21:27:47 -05:00
Lirusaito
b7c1b9f42b Added OverrideAnimations string, so that notifications present an actual permission QUESTION when asking for the perm. 
Conflicts:

	indra/newview/llviewermessage.cpp
 2013-04-20 03:45:15 +02:00
Melanie
2d717dcf17 Merge branch 'master' into Avination-4.0 2013-04-20 03:13:18 +02:00
Melanie
f83717255f Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-04-20 03:13:00 +02:00
Melanie
d593ebfa34 Add another menu insert point in the admin menu. 2013-04-20 03:12:49 +02:00
Melanie
35544cac74 Add another menu insert point in the admin menu. 2013-04-20 03:12:12 +02:00
Latif Khalifa
3bdeb8e8a8 TEMPORARILY disable erroring out during mesh upload 2013-04-20 00:28:36 +02:00
Lirusaito
b8d2bd578c French translation update 2013-04-19 23:59:18 +02:00
Lirusaito
6c93dc1d82 Update LSL information (Adds new AnimationOverride) 2013-04-19 23:59:05 +02:00
Shyotl
733b8e75ac Less prim peekaboo antics. 2013-04-18 23:44:25 +02:00
Latif Khalifa
7e66eb08cf Merge remote-tracking branch 'shyotl/master' 2013-04-18 23:24:40 +02:00
Lirusaito
b51615be20 Support Legacy Region/Estate Environment 
Also Disable Environment Tab when the cap required to use it isn't supported.
 2013-04-18 23:24:30 +02:00
Shyotl
0261f13670 LLSliderCtrl callbacks actually get the child LLSlider object, not the LLSliderCtrl object. 2013-04-18 16:02:10 -05:00
Melanie
63b7b6ddc9 Merge branch 'master' into Avination-4.0 2013-04-18 06:04:52 +02:00
Melanie
ceade84fb0 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-04-18 06:04:30 +02:00