Commit Graph

3258 Commits

Author SHA1 Message Date
Aleric Inglewood
3cedc7bb81 Stats floater fix up.
Add '(UDP)' after Objects, to show that this is UDP bandwidth.
Do not add the received HTTP texture bytes to gTextureList.sTextureBits,
making it (and the 'UDP Textures' graph) indeed pure UDP.
2013-04-30 20:30:46 +02:00
Aleric Inglewood
19e16240d4 Less overshoot in HTTP bandwidth graph for higher values. 2013-04-30 19:13:06 +02:00
Aleric Inglewood
ebfb76c284 Renamed AIPerServiceRequestQueue[Ptr] to AIPerService[Ptr]
This because AIPerService now contains a lot more than just the request
queue.
2013-04-26 19:20:10 +02:00
Aleric Inglewood
304e2b4958 Pass LLControlGroup* to AICurlInterface::startCurlThread instead of each Debug Setting separately. 2013-04-26 16:47:22 +02:00
Aleric Inglewood
fb2f0dd164 Add support for uploading .anim files.
Mostly works, but
indra/newview/skins/default/xui/en-us/floater_animation_anim_preview.xml
needs work (the 'Name:' should be at the top, not the bottom).

Also, it asks if you want to upload this as temporary. It shouldn't do
that.
2013-04-25 19:05:52 +02:00
Aleric Inglewood
e422a89de8 Bring back "Refresh Grid Info" button in grid manager.
If you clicked on 'Add' and then filled in the fields that say
'<required>'.. and then click on OK... Then all the URL's stay blank and
there is no way to fix that anymore (short of deleting the entry first
and NOT filling in the required name?!).

I added the button back to get the URL, at any time. Much more clear.
While at it, I added some tool tips and renamed 'Add' to 'Create'
because it confused the hell out of me to have a grid selected and then
needing to press 'Add' below that.. as if you add something to the
selected grid (Better would be to have the Add button above the
selector, or even be part of the selector drop down).
2013-04-25 03:32:48 +02:00
Aleric Inglewood
45e6b7975f First version of HTTP bandwidth throttling.
Adds throttling based on on average bandwidth usage per HTTP service.
Since only HTTP textures are using this, they are still starved by other
services like inventory and mesh dowloads. Also, it will be needed to
move the maximum number of connections per service the to the PerService
class, and dynamically tune them: reducing the number of connections is
the first thing to do when using too much bandwidth.

I also added a graph for HTTP texture bandwidth to the stats floater.
For some reason the average bandwidth (over 1 second) look almost like
scattered noise... weird for something that is averaged...
2013-04-24 22:04:21 +02:00
Aleric Inglewood
dc5e94812c Inline accessors of HippoGridInfo. 2013-04-23 21:50:51 +02:00
Latif Khalifa
1f58d1250f Merge remote-tracking branch 'lirusaito/master' 2013-04-23 12:57:33 +02:00
Latif Khalifa
a5bb6114b7 Merge remote-tracking branch 'siana/master' 2013-04-23 12:19:09 +02:00
Latif Khalifa
e0077b6941 Merge remote-tracking branch 'lirusaito/master'
Conflicts:
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
	indra/newview/skins/default/xui/fr/panel_preferences_general.xml
2013-04-23 12:17:08 +02:00
Latif Khalifa
5396d17f2a Merge remote-tracking branch 'aleric/master'
Conflicts:
	indra/newview/lltexturefetch.cpp
	indra/newview/llviewerwindow.cpp
2013-04-23 12:13:54 +02:00
Siana Gearz
d6d5d5ae1b Bring back memory stat! Someone is a clobbermonster. 2013-04-23 11:46:44 +02:00
Melanie
ca95c68af5 A fix to the octopus - use dialog channel for value replies 2013-04-23 04:58:28 +02:00
Melanie
274c51c536 Serverside outfits, part tow - final - call a CAP if outfit is changed successfully 2013-04-23 04:52:51 +02:00
Melanie
6addfdfd93 Small bug fix - this could never work 2013-04-23 03:23:14 +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
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
Lirusaito
bfb6e852a2 Added the serverside notifications that are localized now.
One snuck up on me, so I figured I'd add the bunch. Left out some at the end that looked like CHUI.
2013-04-20 22:09:50 -04: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
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
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
7b42ad5e2a Demote assert and allow UDP fallback in case COF fetching times out 2013-04-20 04:49:18 +02:00
Aleric Inglewood
e0aa3489f8 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:28:23 +02: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
Lirusaito
eac5a45562 Added OverrideAnimations string, so that notifications present an actual permission QUESTION when asking for the perm. 2013-04-19 20:10:05 -04:00
Lirusaito
b8d2bd578c French translation update 2013-04-19 23:59:18 +02:00