Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AuroraSim: HippoLimits and HippoGridManager update, and support for Aurora's MaxDrag

Browse Source
This commit is contained in:
Lirusaito
2013-01-21 21:22:04 -05:00
parent aa3228be76
commit 48113f8506
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/hippogridmanager.cpp
View File

@@ -73,7 +73,7 @@ HippoGridInfo::Platform HippoGridInfo::getPlatform()
bool HippoGridInfo::isOpenSimulator() const bool HippoGridInfo::isOpenSimulator() const
{ {
return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM); return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM || mPlatform == HippoGridInfo::PLATFORM_AURORA);
} }
bool HippoGridInfo::isAurora() const bool HippoGridInfo::isAurora() const

4
indra/newview/hippolimits.cpp
View File

@@ -52,9 +52,9 @@ void HippoLimits::setAuroraLimits()
{ {
mMaxAgentGroups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups(); mMaxAgentGroups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
if (mMaxAgentGroups < 0) mMaxAgentGroups = 50; if (mMaxAgentGroups < 0) mMaxAgentGroups = 50;
mMaxPrimScale = 256.0f; mMaxPrimScale = 8192.0f;
mMinPrimScale = 0.001f; mMinPrimScale = 0.001f;
mMaxHeight = 8192.0f; mMaxHeight = 10000.0f;
mMinHoleSize = 0.001f; mMinHoleSize = 0.001f;
mMaxHollow = 99.0f; mMaxHollow = 99.0f;
} }

4
indra/newview/llmaniptranslate.cpp
View File

@@ -67,6 +67,7 @@
#include "llworld.h" #include "llworld.h"
#include "llui.h" #include "llui.h"
#include "pipeline.h" #include "pipeline.h"
#include "hippogridmanager.h"
// [RLVa:KB] // [RLVa:KB]
#include "rlvhandler.h" #include "rlvhandler.h"
@@ -547,6 +548,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
{ {
F32 max_drag_distance = gSavedSettings.getF32("MaxDragDistance"); F32 max_drag_distance = gSavedSettings.getF32("MaxDragDistance");
if (gHippoGridManager->getConnectedGrid()->isAurora())
max_drag_distance = llmin(10000.f, max_drag_distance);
if (relative_move.magVecSquared() > max_drag_distance * max_drag_distance) if (relative_move.magVecSquared() > max_drag_distance * max_drag_distance)
{ {
lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl; lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl;