5 files changed, 27 insertions, 7 deletions

diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index bb2e805..2990a45 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -8,7 +8,8 @@
 #include "llviewercontrol.h"
 
 #include <llerror.h>
-
+#include "llagent.h"
+#include "llviewerregion.h"
 
 HippoLimits *gHippoLimits = 0;
 
@@ -90,7 +91,7 @@ void HippoLimits::setSecondLifeLimits()
         S32 max_groups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
         mMaxAgentGroups = llmax(max_groups, 25);
 
-        mMaxPrimScale = 10.0f;
+        setSecondLifeMaxPrimScale();
         mMinPrimScale = 0.01f;
         mMaxHeight = 4096.0f;
         mMinHoleSize = 0.05f;  
@@ -115,6 +116,21 @@ void HippoLimits::setSecondLifeLimits()
         mVoiceConnector = "SLVoice";
 }
 
+void HippoLimits::setSecondLifeMaxPrimScale()
+{
+        // SecondLife Mesh sims that allow 64m prims are ones that have BOTH these caps
+        if (gAgent.getRegion()
+                && !gAgent.getRegion()->getCapability("GetMesh").empty()
+                && !gAgent.getRegion()->getCapability("ObjectAdd").empty())
+        {
+                mMaxPrimScale = 64.f;
+        }
+        else
+        {
+                mMaxPrimScale = 10.f;
+        }
+}
+
 F32 HippoLimits::getMaxPrimScale() const
 {
         if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
diff --git a/linden/indra/newview/hippolimits.h b/linden/indra/newview/hippolimits.h
index 9d6b2f6..d63d1b0 100644
--- a/linden/indra/newview/hippolimits.h
+++ b/linden/indra/newview/hippolimits.h
@@ -64,6 +64,7 @@ public:
 private:
         void    setOpenSimLimits();
         void    setSecondLifeLimits();
+        void    setSecondLifeMaxPrimScale();
 };
 
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index f67f0dc..32d7172 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3828,10 +3828,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                 return;
         }
 
+        gHippoLimits->setLimits();
+
         if (!gLastVersionChannel.empty())
         {
-                gHippoLimits->setLimits();
-
                 if (gSavedSettings.getBOOL("ServerVersionChangedChat"))
                 {
                         LLStringUtil::format_map_t args;
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index eba0db7..a43e0c0 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1439,12 +1439,14 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("FetchLibDescendents");
         capabilityNames.append("GetDisplayNames");
         capabilityNames.append("SetDisplayName");
+        capabilityNames.append("GetMesh"); // lets us know if this is a SL-Mesh region
         capabilityNames.append("GetTexture");
         capabilityNames.append("GroupProposalBallot");
         capabilityNames.append("HomeLocation");
         capabilityNames.append("MapLayer");
         capabilityNames.append("MapLayerGod");
         capabilityNames.append("NewFileAgentInventory");
+        capabilityNames.append("ObjectAdd"); // lets us know if this is a SL-Mesh region
         capabilityNames.append("ParcelPropertiesUpdate");
         capabilityNames.append("ParcelMediaURLFilterList");
         capabilityNames.append("ParcelNavigateMedia");
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 863992c..91a63eb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -35,16 +35,17 @@
            max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
            word_wrap="true">
         The Imprudence Viewer was rocked hard by:
-        Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
+        Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, CodeBastard Redgrave and Boroondas Gupte.
+
         http://kokuaviewer.org/
 
         Imprudence is so awesome thanks to contributions from many generous people:
 
-        For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar.
+        For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen,  Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth,  Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa,  Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr,  Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
 
         For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
 
-        Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+        Thanks also to the developer(s) of the  Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer  for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
 
         For a complete list of who did what, read the release notes!