From 7067b31a6114089217e482bfecc58fd56bed4272 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 26 Jun 2009 09:39:58 +0200
Subject: BROKEN logoff/relog crashing inconsistently on various startup
 states.

---
 linden/indra/newview/hippoLimits.cpp | 54 ++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 linden/indra/newview/hippoLimits.cpp

(limited to 'linden/indra/newview/hippoLimits.cpp')

diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
new file mode 100644
index 0000000..63a5899
--- /dev/null
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -0,0 +1,54 @@
+
+
+#include "hippoLimits.h"
+
+#include "hippoGridManager.h"
+
+#include <llerror.h>
+
+
+HippoLimits *gHippoLimits = 0;
+
+
+HippoLimits::HippoLimits()
+{
+	setLimits();
+}
+
+
+void HippoLimits::setLimits()
+{
+	if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
+		setSecondLifeLimits();
+	} else {
+		setOpenSimLimits();
+	}
+}
+
+
+void HippoLimits::setOpenSimLimits()
+{
+	mMaxAgentGroups = 100;
+	mMaxPrimScale = 256.0f;
+	mMaxHeight = 10000.0f;
+	if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
+		llinfos << "Using rendering compatible OpenSim limits." << llendl;
+		mMinHoleSize = 0.05f;  
+		mMaxHollow = 0.95f;
+	} else {
+		llinfos << "Using Hippo OpenSim limits." << llendl;
+		mMinHoleSize = 0.01f;  
+		mMaxHollow = 0.99f;
+	}
+}
+
+void HippoLimits::setSecondLifeLimits()
+{
+	llinfos << "Using Second Life limits." << llendl;
+	mMaxAgentGroups = 25;
+	mMaxPrimScale = 10.0f;
+	mMaxHeight = 4096.0f;
+	mMinHoleSize = 0.05f;  
+	mMaxHollow = 0.95f;
+}
+
-- 
cgit v1.1


From f57eabefa1291f4e047aa03416c9c544413b9f0e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 10 Sep 2009 02:31:50 -0500
Subject: Fixed line endings on hippo and grid manager files.

---
 linden/indra/newview/hippoLimits.cpp | 108 +++++++++++++++++------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

(limited to 'linden/indra/newview/hippoLimits.cpp')

diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
index 63a5899..d5deb9f 100644
--- a/linden/indra/newview/hippoLimits.cpp
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -1,54 +1,54 @@
-
-
-#include "hippoLimits.h"
-
-#include "hippoGridManager.h"
-
-#include <llerror.h>
-
-
-HippoLimits *gHippoLimits = 0;
-
-
-HippoLimits::HippoLimits()
-{
-	setLimits();
-}
-
-
-void HippoLimits::setLimits()
-{
-	if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
-		setSecondLifeLimits();
-	} else {
-		setOpenSimLimits();
-	}
-}
-
-
-void HippoLimits::setOpenSimLimits()
-{
-	mMaxAgentGroups = 100;
-	mMaxPrimScale = 256.0f;
-	mMaxHeight = 10000.0f;
-	if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
-		llinfos << "Using rendering compatible OpenSim limits." << llendl;
-		mMinHoleSize = 0.05f;  
-		mMaxHollow = 0.95f;
-	} else {
-		llinfos << "Using Hippo OpenSim limits." << llendl;
-		mMinHoleSize = 0.01f;  
-		mMaxHollow = 0.99f;
-	}
-}
-
-void HippoLimits::setSecondLifeLimits()
-{
-	llinfos << "Using Second Life limits." << llendl;
-	mMaxAgentGroups = 25;
-	mMaxPrimScale = 10.0f;
-	mMaxHeight = 4096.0f;
-	mMinHoleSize = 0.05f;  
-	mMaxHollow = 0.95f;
-}
-
+
+
+#include "hippoLimits.h"
+
+#include "hippoGridManager.h"
+
+#include <llerror.h>
+
+
+HippoLimits *gHippoLimits = 0;
+
+
+HippoLimits::HippoLimits()
+{
+	setLimits();
+}
+
+
+void HippoLimits::setLimits()
+{
+	if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
+		setSecondLifeLimits();
+	} else {
+		setOpenSimLimits();
+	}
+}
+
+
+void HippoLimits::setOpenSimLimits()
+{
+	mMaxAgentGroups = 100;
+	mMaxPrimScale = 256.0f;
+	mMaxHeight = 10000.0f;
+	if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
+		llinfos << "Using rendering compatible OpenSim limits." << llendl;
+		mMinHoleSize = 0.05f;  
+		mMaxHollow = 0.95f;
+	} else {
+		llinfos << "Using Hippo OpenSim limits." << llendl;
+		mMinHoleSize = 0.01f;  
+		mMaxHollow = 0.99f;
+	}
+}
+
+void HippoLimits::setSecondLifeLimits()
+{
+	llinfos << "Using Second Life limits." << llendl;
+	mMaxAgentGroups = 25;
+	mMaxPrimScale = 10.0f;
+	mMaxHeight = 4096.0f;
+	mMinHoleSize = 0.05f;  
+	mMaxHollow = 0.95f;
+}
+
-- 
cgit v1.1