Second Life viewer sources 1.18.3.2-RC

1 files changed, 44 insertions, 4 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4ac1da4..0d7a2cd 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -40,6 +40,7 @@
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llchat.h"
+#include "llfeaturemanager.h"
 #include "llfocusmgr.h"
 #include "llfontgl.h"
 #include "llinstantmessage.h"
@@ -98,6 +99,7 @@
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
 #include "llfloatergroupinfo.h"
+#include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
 #include "llfloaterhtml.h"
 #include "llfloaterhtmlhelp.h"
@@ -411,7 +413,7 @@ void toggle_debug_menus(void*);
 void toggle_map( void* user_data );
 void export_info_callback(LLAssetInfo *info, void **user_data, S32 result);
 void export_data_callback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void **user_data, S32 result);
-void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result);
+void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status);
 BOOL menu_check_build_tool( void* user_data );
 void handle_reload_settings(void*);
 void focus_here(void*);
@@ -1226,7 +1228,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 
         LLMenuItemCheckGL* item;
         item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT);
-        item->setEnabled(gGLManager.mHasOcclusionQuery);
+        item->setEnabled(gGLManager.mHasOcclusionQuery && gFeatureManagerp->isFeatureAvailable("UseOcclusion"));
         menu->append(item);
         
         
@@ -5100,6 +5102,43 @@ class LLToolsLookAtSelection : public view_listener_t
         }
 };
 
+void callback_invite_to_group(LLUUID group_id, void *user_data)
+{
+        std::vector<LLUUID> agent_ids;
+        agent_ids.push_back(*(LLUUID *)user_data);
+        
+        LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
+}
+
+void invite_to_group(const LLUUID& dest_id)
+{
+        LLViewerObject* dest = gObjectList.findObject(dest_id);
+        if(dest && dest->isAvatar())
+        {
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&dest_id);
+                }
+        }
+}
+
+class LLAvatarInviteToGroup : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar* avatar = find_avatar_from_object( gViewerWindow->lastObjectHit() );
+                if(avatar)
+                {
+                        invite_to_group(avatar->getID());
+                }
+                return true;
+        }
+};
+
 class LLAvatarAddFriend : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -7434,7 +7473,7 @@ class LLViewToggleRenderType : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 LLString type = userdata.asString();
-                if (type == "particles")
+                if (type == "hideparticles")
                 {
                         LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
                 }
@@ -7448,7 +7487,7 @@ class LLViewCheckRenderType : public view_listener_t
         {
                 LLString type = userdata["data"].asString();
                 bool new_value = false;
-                if (type == "particles")
+                if (type == "hideparticles")
                 {
                         new_value = LLPipeline::toggleRenderTypeControlNegated((void *)LLPipeline::RENDER_TYPE_PARTICLES);
                 }
@@ -7750,6 +7789,7 @@ void initialize_menus()
         addMenu(new LLAvatarDebug(), "Avatar.Debug");
         addMenu(new LLAvatarVisibleDebug(), "Avatar.VisibleDebug");
         addMenu(new LLAvatarEnableDebug(), "Avatar.EnableDebug");
+        addMenu(new LLAvatarInviteToGroup(), "Avatar.InviteToGroup");
         addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
         addMenu(new LLAvatarEject(), "Avatar.Eject");
         addMenu(new LLAvatarSendIM(), "Avatar.SendIM");