Commit Graph

20 Commits

Author SHA1 Message Date
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
77fdb895e6 Add CURRECY_TEXT definition and handling for internationalization 2013-04-27 02:39:39 +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
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
Melanie
09965b0cdf Add support for Avination's "Upload Credits" 2013-04-15 15:55:46 +02:00
Lirusaito
194902798b HippoGridManager and HippoLimits updated with Aurora bits from Voodoo.
Adds isAurora() to HippoGridManager
Adds setAuroraLimits and Aurora case to setLimits() in HippoLimits
2013-01-01 18:04:39 -05:00
Aleric Inglewood
fce64f8f12 Add LLWebProfile and responders.
Adds finding and using libjsoncpp. Note that the old cmake file
found libjson, not the same thing.

Adds Debug Setting WebProfileNonProductionURL (next to already existing
WebProfileURL) to mimic V3's behavior and use a different URL for aditi.
These Debug Settings are using by (the new) getProfileURL() (copied
from V3 with just a minor fix).

Adds HippoGridInfo::isInProductionGrid() next to the existing
LLViewerLogin::isInProductionGrid that always returned true.
The former should only be called SL grids and then only returns
true for agni (and false for aditi et al). The latter was changed
to now always return true except on SL when the grid isn't agni.
The first is used for SL-only cases, the latter for things like
colors and for godmode decision logic.

V3's llwebprofile.cpp was fixed to compile on singu, with only real
difference that I dropped the Content-Type headers for the GET methods.
2012-11-16 02:00:06 +01:00
Siana Gearz
9b268c3654 Fixing the crash in grid list 2012-02-19 20:07:17 +01:00
Siana Gearz
f7cc9c4d33 Hopefully more correctness in grid manager editor 2012-02-19 00:42:23 +01:00
RevolutionSmythe
b8cd305f89 Get rid of grid nicks, and just use the Grid Name everywhere (its cleaner, and one less thing to fill out). 2011-08-18 20:56:35 +02:00
RevolutionSmythe
8fc875cee8 Set up reading the grid message from the get_grid_info from Aurora if it exists. 2011-08-18 20:56:20 +02:00
RevolutionSmythe
d84140ead9 Add Aurora to the grid info platform list. Attempt to stop sending "resident" as the last name, except with Second Life. 2011-08-18 20:56:03 +02:00
Siana Gearz
9d57163479 Inventory Link auto-detection 2011-06-15 04:53:52 +02:00
Siana Gearz
0f038bbffc Grid manager stuff, part. debrand 2011-04-02 05:03:10 +02:00
Siana Gearz
b34d9fb88e MultiAttach unbork attempt 2011-04-01 05:13:39 +02:00
Siana Gearz
d97f87b05f Grid currency, partial 2011-02-11 22:37:52 +01:00
Siana Gearz
d962b05a9e Hippo Grid Manager 2011-01-29 18:23:56 +01:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00