HippoGridManager and HippoLimits updated with Aurora bits from Voodoo.
Adds isAurora() to HippoGridManager Adds setAuroraLimits and Aurora case to setLimits() in HippoLimits
This commit is contained in:
@@ -76,6 +76,11 @@ bool HippoGridInfo::isOpenSimulator() const
|
||||
return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM);
|
||||
}
|
||||
|
||||
bool HippoGridInfo::isAurora() const
|
||||
{
|
||||
return (mPlatform == HippoGridInfo::PLATFORM_AURORA);
|
||||
}
|
||||
|
||||
bool HippoGridInfo::isSecondLife() const
|
||||
{
|
||||
return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
|
||||
@@ -92,11 +97,15 @@ const std::string& HippoGridInfo::getGridName() const
|
||||
return mGridName;
|
||||
}
|
||||
|
||||
const std::string& HippoGridInfo::getGridOwner() const {
|
||||
if(isSecondLife()) {
|
||||
const std::string& HippoGridInfo::getGridOwner() const
|
||||
{
|
||||
if(isSecondLife())
|
||||
{
|
||||
static const std::string ll = "Linden Lab";
|
||||
return ll;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
return this->getGridName();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@ public:
|
||||
|
||||
Platform getPlatform();
|
||||
bool isOpenSimulator() const;
|
||||
bool isAurora() const;
|
||||
bool isSecondLife() const;
|
||||
bool isInProductionGrid() const; // Should only be called if isSecondLife() returns true.
|
||||
const std::string& getGridName() const;
|
||||
|
||||
@@ -21,6 +21,8 @@ void HippoLimits::setLimits()
|
||||
{
|
||||
if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
|
||||
setSecondLifeLimits();
|
||||
} else if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_AURORA) {
|
||||
setAuroraLimits();
|
||||
} else {
|
||||
setOpenSimLimits();
|
||||
}
|
||||
@@ -46,6 +48,17 @@ void HippoLimits::setOpenSimLimits()
|
||||
}
|
||||
}
|
||||
|
||||
void HippoLimits::setAuroraLimits()
|
||||
{
|
||||
mMaxAgentGroups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
|
||||
if (mMaxAgentGroups < 0) mMaxAgentGroups = 50;
|
||||
mMaxPrimScale = 256.0f;
|
||||
mMinPrimScale = 0.001f;
|
||||
mMaxHeight = 8192.0f;
|
||||
mMinHoleSize = 0.001f;
|
||||
mMaxHollow = 99.0f;
|
||||
}
|
||||
|
||||
void HippoLimits::setSecondLifeLimits()
|
||||
{
|
||||
llinfos << "Using Second Life limits." << llendl;
|
||||
|
||||
@@ -26,6 +26,7 @@ private:
|
||||
float mMinPrimScale;
|
||||
|
||||
void setOpenSimLimits();
|
||||
void setAuroraLimits();
|
||||
void setSecondLifeLimits();
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user