Aleric Inglewood
410f9d92a5
Minor improvemnt of coding style.
2013-05-07 02:01:31 +02:00
Drake Arconis
47e83bf677
Merge remote-tracking branch 'LiruFox/master'
2013-05-06 11:44:21 -07:00
Siana Gearz
30332cff3f
Sanitize cmake, cleanup develop.py
2013-05-06 06:07:23 +02:00
Drake Arconis
e0ef803ed5
Fix issue a different way and supress new gcc 4.8 warning
2013-05-05 19:24:13 -07:00
Aleric Inglewood
84e7f15dc5
Fix initialization list order (compiler warnings)
2013-05-06 03:26:22 +02:00
Drake Arconis
36416743d4
fix a buggy
2013-05-05 18:23:26 -07:00
Drake Arconis
73b10e6b29
Made compiler detection more reliable and cleanup clang warnings
2013-05-05 17:56:16 -07:00
Aleric Inglewood
1d629438c0
Add HTTP bandwidth throttling for every other responder.
...
Most notably getMesh (the only one possibly using any significant
bandwidth), but in general every type of requests that just have to
happen anyway and in the order they are requested: they are just passed
to the curl thread, but now the curl thread will queue them and hold
back if the (general) service they use is loaded too heavily.
2013-05-06 02:54:10 +02:00
Aleric Inglewood
75a45f501e
Moved a part of AIPerService::wantsMoreHTTPRequestsFor to a new function.
...
The new function is AIPerService::checkBandwidthUsage.
No functional changes were made.
2013-05-06 02:54:10 +02:00
Aleric Inglewood
fd3e8e4a23
Preparation for AIPerService::checkBandwidthUsage.
...
Don't pass arguments to wantsMoreHTTPRequestsFor, but use globals in
llmessage: AIPerService::sHTTPThrottleBandwidth125 and
AIPerService::sNoHTTPBandwidthThrottling instead.
This is needed later on.
2013-05-06 02:54:03 +02:00
Aleric Inglewood
32a5494c79
Limit sMaxPipelinedRequests changes to once per 40ms, plus code clean up.
...
Mostly renaming stuff and moving static variables to class AIPerSerive.
2013-05-04 20:02:21 +02:00
Shyotl
6fb0c158de
Fix rightclicking fully transparent prims when show-transparent is enabled.
2013-05-03 21:42:14 -05:00
Shyotl
e8ce35ebf8
Merge branch 'master' into UICleanup
...
Conflicts:
indra/llcommon/llstl.h
indra/newview/jcfloaterareasearch.cpp
indra/newview/jcfloaterareasearch.h
indra/newview/llfloateranimpreview.cpp
indra/newview/llfloateranimpreview.h
indra/newview/llfloaterperms.cpp
indra/newview/llfloaterproperties.cpp
indra/newview/llpanelpermissions.cpp
indra/newview/llviewermenu.cpp
2013-05-03 21:41:51 -05:00
Shyotl
532fc68657
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2013-05-03 15:36:05 -05:00
Shyotl
525f3c6a1d
Added new transformfeedback fasttimers, and disabled rasterizing when performing transform feedback.
2013-05-03 14:35:10 -05:00
Shyotl
808341e184
Testing: Be a bit more OCD about avoiding starting new streams before the previous one has been successfully been released.
2013-05-03 14:32:18 -05:00
Shyotl
701fc87c05
Minor cleanup and additional nullchecks.
2013-05-03 14:29:55 -05:00
Shyotl
31eb3e8d24
Cleaned up LLManipScale::nearestAxis to dodge a compiler crash that was found when playing with particular compiler options.
2013-05-03 14:28:20 -05:00
Latif Khalifa
a2df4b6693
Merge remote-tracking branch 'aleric/master'
2013-05-03 19:40:56 +02:00
Latif Khalifa
25dd719e39
Revert "Spot-fix the CAPS issue preventing UseHTTPInventory debug setting from working."
...
On-the-fly switching of UseHTTPInventory provided in patch by Aleric.
This reverts commit bdb74add3c .
2013-05-03 19:39:54 +02:00
Aleric Inglewood
4cc42cd5bd
Fix for file-5.14
2013-05-03 19:05:31 +02:00
Aleric Inglewood
4983fd6ab6
Allow switching between HTTP and UDP inventory without relogging.
...
This also makes the viewer immune for grids that send the FetchInventory2 et al
capabilities regardsless of whether we requested them (in fact, we always
request them now: we need them when someone switches in the middle of a session).
Note that (I tested that) textures could already be switched between
HTTP and UDP without relogging.
2013-05-03 18:24:33 +02:00
Aleric Inglewood
673e96e829
Linux script fix at exit viewer.
2013-05-03 00:06:32 +02:00
Shyotl
b0778bf27e
Template fun to compress our legacy menu<->floater glue.
2013-04-30 20:30:51 -05:00
Shyotl
b474b3c680
Avoid bogging down main thread with excessive LLInstanceTrackerBase::getInstances calls.
2013-04-30 20:27:03 -05:00
Melanie
bdb74add3c
Spot-fix the CAPS issue preventing UseHTTPInventory debug setting from working.
2013-05-01 02:29:34 +02:00
Melanie
fc183be845
Add RLV toggle to prefs
2013-05-01 02:29:17 +02:00
Melanie
e00293baba
Add the Limit Select Distance control to the input&camera panel
2013-05-01 01:56:36 +02:00
Melanie
ec266b895e
XMLize the "Singularity" menu and add Rebake and Region Debug Console to it.
2013-05-01 00:23:10 +02:00
Aleric Inglewood
13e246611d
Make refresh_desktop_app_entry.sh executable.
2013-04-30 22:48:32 +02:00
Aleric Inglewood
873b61c39d
Fix comment.
2013-04-30 22:16:29 +02:00
Aleric Inglewood
60a47b8915
Merge remote-tracking branch 'singu/master'
2013-04-30 20:43:40 +02:00
Aleric Inglewood
0c7e62ab59
Add throttling to HTTP inventory (bulk) fetching.
...
Call AIPerService::wantsMoreHTTPRequestsFor in
LLInventoryModelBackgroundFetch::bulkFetch to determine if curl is ready
for the next batch or not, instead of using inaccurate heuristic code
that is just guessing a bit.
2013-04-30 20:36:00 +02:00
Aleric Inglewood
a1a019d319
Don't call LLInventoryModelBackgroundFetch::backgroundFetchCB unnecessarily
...
Remove LLInventoryModelBackgroundFetch::backgroundFetchCB from
gIdleCallbacks when we don't need it anymore.
2013-04-30 20:34:01 +02:00
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
74023d5303
Compile fix.
...
Move the destructor (and copy constructor while I was at it) to the .cpp
file in order to avoid instantiating the destructor of
boost::intrusive_ptr<ThreadSafeBufferedCurlEasyRequest> from a header,
which would require the class ThreadSafeBufferedCurlEasyRequest
to be defined in that header, which is unnecessary. In other words,
this avoid the need to include "aicurl.h" in headers using
AIPerService[Ptr].
Also fixed indentation of a comment.
2013-04-30 20:23:42 +02:00
Aleric Inglewood
2a9c48d8d3
Add debug function 'is_single_threaded'
...
Usage:
AIThreadID foo(AIThreadID::none);
...
llassert(is_single_threaded(foo));
...
llassert(is_single_threaded(foo));
...
etc
The first call to is_single_threaded(foo) remembers the thread,
and after that it is enforced that any call from anywhere that uses foo
is done by the same thread.
If AIThreadID::none is omitted then the thread is enforced to the thread
that creates the AIThreadID.
2013-04-30 20:22:38 +02:00
Aleric Inglewood
19e16240d4
Less overshoot in HTTP bandwidth graph for higher values.
2013-04-30 19:13:06 +02:00
Latif Khalifa
e1df1b98f7
Merge remote-tracking branch 'aleric/master'
2013-04-28 23:35:30 +02:00
Melanie
c1e31c403e
Make sure we only do a show in inventory if a sinle item is given. Enything else makes no sense or bombs
2013-04-28 23:32:17 +02:00
Melanie
2cfafadbcd
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
...
Conflicts:
indra/newview/hippogridmanager.cpp
indra/newview/hippogridmanager.h
2013-04-28 20:32:58 +02:00
Melanie
aa996a3a1b
Finally allow a very small communicate window to be saved and restored properly at the size the user set it.
2013-04-28 19:42:18 +02:00
Damian Zhaoying
3cb6e5fa9f
Little fix in some spanish translations
2013-04-28 13:35:52 -03:00
Aleric Inglewood
1d2b3d3dc9
Derived classes may access this.
2013-04-28 03:31:16 +02:00
Melanie
77fdb895e6
Add CURRECY_TEXT definition and handling for internationalization
2013-04-27 02:39:39 +02:00
Damian Zhaoying
ecf87fd720
add new all spanish translations files
2013-04-26 20:51:14 -03:00
Damian Zhaoying
d2acf3c6a1
update and fix all spanish translations files
2013-04-26 20:03:28 -03: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
6c1335af50
Moved connect limits per service to AIPerServiceRequestQueue.
...
Added AIPerServiceRequestQueue::mConcurrectConnections and
AIPerServiceRequestQueue::mMaxPipelinedRequests.
2013-04-26 19:13:18 +02:00
Aleric Inglewood
304e2b4958
Pass LLControlGroup* to AICurlInterface::startCurlThread instead of each Debug Setting separately.
2013-04-26 16:47:22 +02:00