1 files changed, 14 insertions, 9 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 7697f77..9d06853 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -225,6 +225,8 @@
 #include "jcfloater_animation_list.h"
 #include "llfloaterassetbrowser.h"
 
+#include "hippoLimits.h"
+
 using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
@@ -4669,15 +4671,18 @@ class LLToolsLink : public view_listener_t
                         return true;
                 }
 
-                S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
-                if (object_count > MAX_CHILDREN_PER_TASK + 1)
+                S32 max_linked_prims = gHippoLimits->getMaxLinkedPrims();
+                if (max_linked_prims > -1)
                 {
-                        LLSD args;
-                        args["COUNT"] = llformat("%d", object_count);
-                        int max = MAX_CHILDREN_PER_TASK+1;
-                        args["MAX"] = llformat("%d", max);
-                        LLNotifications::instance().add("UnableToLinkObjects", args);
-                        return true;
+                        S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
+                        if (object_count >  max_linked_prims + 1)
+                        {
+                                LLSD args;
+                                args["COUNT"] = llformat("%d", object_count);
+                                args["MAX"] = llformat("%d", max_linked_prims+1);
+                                LLNotifications::instance().add("UnableToLinkObjects", args);
+                                return true;
+                        }
                 }
 
                 if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
@@ -5861,7 +5866,7 @@ class LLShowFloater : public view_listener_t
                 }
                 else if (floater_name == "help f1")
                 {
-                        LLFloaterMediaBrowser::helpF1();
+                        gViewerHtmlHelp.show();
                 }
                 else if (floater_name == "help tutorial")
                 {