Merge branch 'weekly' into SNOW-713

7 files changed, 242 insertions, 1 deletions

diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 9635f99..1248a9a 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -605,6 +605,7 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
         mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ),
         mBorderThickness( 2 ),
         mOnDoubleClickCallback( NULL ),
+        mOnRightMouseDownCallback( NULL ),
         mOnMaximumSelectCallback( NULL ),
         mOnSortChangedCallback( NULL ),
         mHighlightedItem(-1),
@@ -2082,6 +2083,27 @@ BOOL LLScrollListCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
         return TRUE;
 }
 
+BOOL LLScrollListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+        //BOOL handled = FALSE;
+        BOOL handled = handleClick(x, y, mask);
+
+        if (!handled)
+        {
+                // Offer the click to the children, even if we aren't enabled
+                // so the scroll bars will work.
+                if (NULL == LLView::childrenHandleRightMouseDown(x, y, mask))
+                {
+                        if( mCanSelect && mOnRightMouseDownCallback )
+                        {
+                                mOnRightMouseDownCallback( x, y, mCallbackUserData );
+                        }
+                }
+        }
+
+        return TRUE;
+}
+
 BOOL LLScrollListCtrl::handleClick(S32 x, S32 y, MASK mask)
 {
         // which row was clicked on?
@@ -3631,6 +3653,22 @@ BOOL LLColumnHeader::handleDoubleClick(S32 x, S32 y, MASK mask)
         return TRUE;
 }
 
+BOOL LLColumnHeader::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+        if (canResize() && mResizeBar->getRect().pointInRect(x, y))
+        {
+                // reshape column to max content width
+                LLRect column_rect = getRect();
+                column_rect.mRight = column_rect.mLeft + mColumn->mMaxContentWidth;
+                userSetShape(column_rect);
+        }
+        else
+        {
+                onClick(this);
+        }
+        return TRUE;
+}
+
 void LLColumnHeader::setImage(const std::string &image_name)
 {
         if (mButton)
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index e875d7a..4be7ff7 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -241,6 +241,7 @@ public:
 
         /*virtual*/ void draw();
         /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 
         /*virtual*/ void showList();
         /*virtual*/ LLView*     findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding);
@@ -431,6 +432,7 @@ public:
 
         void                    highlightNthItem( S32 index );
         void                    setDoubleClickCallback( void (*cb)(void*) ) { mOnDoubleClickCallback = cb; }
+        void                    setRightMouseDownCallback( void (*cb)(S32 x, S32 y, void*) ) { mOnRightMouseDownCallback = cb; }
         void                    setMaximumSelectCallback( void (*cb)(void*) ) { mOnMaximumSelectCallback = cb; }
         void                    setSortChangedCallback( void (*cb)(void*) ) { mOnSortChangedCallback = cb; }
 
@@ -517,6 +519,7 @@ public:
         /*virtual*/ BOOL        handleMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleDoubleClick(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleRightMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask);
         /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char);
@@ -660,6 +663,7 @@ private:
 
         S32                             mBorderThickness;
         void                    (*mOnDoubleClickCallback)(void* userdata);
+        void                    (*mOnRightMouseDownCallback)(S32 x, S32 y, void* userdata);
         void                    (*mOnMaximumSelectCallback)(void* userdata );
         void                    (*mOnSortChangedCallback)(void* userdata);
 
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 682bf64..c94fc51 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -66,6 +66,7 @@
 
                                                         <!--<string>Messaging</string>-->
                                                         <!--<string>Notifications</string>-->
+              <!--<string>Plugin</string>-->
               <!--<string>Radar</string>-->
                                                         <!--<string>ShaderLoading</string>-->
 
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 22e4aa5..33299ba 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1,9 +1,57 @@
 <?xml version="1.0" ?>
 <llsd>
 <map>
-  
+
+<!-- for Aurora Sim -->
+
+  <key>TimeOffset</key>
+  <map>
+    <key>Comment</key>
+    <string>difference in hours to UTC time</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>UseTimeOffset</key>
+  <map>
+    <key>Comment</key>
+    <string>Use debug setting TimeOffset</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>TimeOffsetDST</key>
+  <map>
+    <key>Comment</key>
+    <string>TimeOffset has Day Light Savings</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+
   <!-- Imprudence-specific settings -->
 
+  <key>AllowEditingOfTrees</key>
+  <map>
+    <key>Comment</key>
+    <string>Allow editing of trees and grass</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+
   <!-- begin name highlighting -->
   
   <key>HighlightNickname01</key>
diff --git a/linden/indra/newview/jcfloaterareasearch.cpp b/linden/indra/newview/jcfloaterareasearch.cpp
index ed00447..0918431 100644
--- a/linden/indra/newview/jcfloaterareasearch.cpp
+++ b/linden/indra/newview/jcfloaterareasearch.cpp
@@ -38,7 +38,14 @@
 #include "llscrolllistctrl.h"
 
 #include "llagent.h"
+
+#include "llfloatertools.h"
+#include "llmenugl.h"
+#include "llselectmgr.h"
+#include "lltoolcomp.h"
+#include "lltoolmgr.h"
 #include "lltracker.h"
+#include "llviewerjoystick.h"
 #include "llviewerobjectlist.h"
 #include "llviewercontrol.h"
 #include "jcfloaterareasearch.h"
@@ -63,6 +70,19 @@ mResultList(0)
         llassert_always(sInstance == NULL);
         sInstance = this;
         mLastUpdateTimer.reset();
+
+
+        // Register event listeners for popup menu
+        mPopupMenuHandler = new PopupMenuHandler(this);
+        mPopupMenuHandler->registerListener(this, "Popup.HandleMenu");
+
+        LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_areasearch.xml", this);
+        if (!menu)
+        {
+                menu = new LLMenuGL(LLStringUtil::null);
+        }
+        menu->setVisible(FALSE);
+        mPopupMenuHandle = menu->getHandle();
 }
 
 JCFloaterAreaSearch::~JCFloaterAreaSearch()
@@ -90,6 +110,7 @@ BOOL JCFloaterAreaSearch::postBuild()
         mResultList = getChild<LLScrollListCtrl>("result_list");
         mResultList->setCallbackUserData(this);
         mResultList->setDoubleClickCallback(onDoubleClick);
+        mResultList->setRightMouseDownCallback(onRightMouseDown);
         mResultList->sortByColumn("Name", TRUE);
 
         mCounterText = getChild<LLTextBox>("counter");
@@ -159,6 +180,102 @@ void JCFloaterAreaSearch::onDoubleClick(void *userdata)
         }
 }
 
+//static
+void JCFloaterAreaSearch::onRightMouseDown(S32 x, S32 y, void *userdata)
+{
+        JCFloaterAreaSearch* self = (JCFloaterAreaSearch*)userdata;
+
+        self->setFocus( TRUE );
+        LLMenuGL* menu = (LLMenuGL*)self->mPopupMenuHandle.get();
+        if(menu)
+        {
+                if(menu->getVisible())
+                {
+                        menu->setVisible(FALSE);
+                }
+                else
+                {
+                        LLScrollListItem *item = self->mResultList->getFirstSelected();
+                        if (item)
+                        {
+                                self->mSelectedItem = item;
+                                menu->setVisible(TRUE);
+                                menu->setFocus(TRUE);
+                                menu->arrange();
+                                menu->updateParent(LLMenuGL::sMenuContainer);
+                                LLMenuGL::showPopup(self, menu, x, y+50);
+                        }
+                        else
+                        {
+                                self->mSelectedItem = NULL;
+                        }
+                }
+        }
+
+}
+
+JCFloaterAreaSearch::PopupMenuHandler::PopupMenuHandler(const JCFloaterAreaSearch* instance)
+        : mInstance(instance)
+{
+
+}
+
+// static
+bool JCFloaterAreaSearch::PopupMenuHandler::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        std::string command = userdata.asString();
+        JCFloaterAreaSearch* self = (JCFloaterAreaSearch*)mInstance;
+
+        if (self && self->mSelectedItem && !command.empty())
+        {
+                LLUUID object_id = self->mSelectedItem->getUUID();
+                LLViewerObject* object = gObjectList.findObject(object_id);
+
+                if (object && !object->isAvatar())
+                {
+
+
+                        if ("teleport" == command)
+                        {
+                                LLVector3d pos = object->getPositionGlobal();
+                                gAgent.teleportViaLocation(pos);        
+
+                        }
+                        else
+                        {
+                                if ("cam" || "edit" == command)
+                                {
+                
+                                        gAgent.setFocusOnAvatar(FALSE, FALSE);
+                                        gAgent.changeCameraToThirdPerson();
+                                        gAgent.setFocusGlobal(object->getPositionGlobal(), object_id);
+                                        gAgent.setCameraPosAndFocusGlobal(object->getPositionGlobal()
+                                                + LLVector3d(3.5,1.35,0.75) * object->getRotation(),
+                                                                                object->getPositionGlobal(),
+                                                                                object_id );
+                                        if ("edit" == command)
+                                        {
+                                                if(!object->isSelected())
+                                                {
+                                                        LLSelectMgr::getInstance()->deselectAll();
+                                                        LLSelectMgr::getInstance()->selectObjectAndFamily(object);
+                                                }
+
+                                                gFloaterTools->open();
+                                                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
+                                                gFloaterTools->setEditTool( LLToolCompTranslate::getInstance() );
+                                
+                                                LLViewerJoystick::getInstance()->moveObjects(true);
+                                                LLViewerJoystick::getInstance()->setNeedsReset(true);
+                                        }
+                                }
+                        }
+                }
+        }
+
+        return true;
+}
+
 // static
 void JCFloaterAreaSearch::cancel(void* data)
 {
diff --git a/linden/indra/newview/jcfloaterareasearch.h b/linden/indra/newview/jcfloaterareasearch.h
index 1512030..5bceb59 100644
--- a/linden/indra/newview/jcfloaterareasearch.h
+++ b/linden/indra/newview/jcfloaterareasearch.h
@@ -35,9 +35,11 @@
 #include "lluuid.h"
 #include "llstring.h"
 #include "llframetimer.h"
+#include "llmemberlistener.h"
 
 class LLTextBox;
 class LLScrollListCtrl;
+class LLScrollListItem;
 class LLViewerRegion;
 
 struct AObjectDetails
@@ -71,6 +73,7 @@ private:
         static void onCommitLine(LLLineEditor* line, void* user_data);
         static void requestIfNeeded(LLViewerObject *objectp);
         static void onDoubleClick(void *userdata);
+        static void onRightMouseDown(S32 x, S32 y, void *userdata);
 
         enum OBJECT_COLUMN_ORDER
         {
@@ -86,6 +89,7 @@ private:
 
         LLTextBox* mCounterText;
         LLScrollListCtrl* mResultList;
+        LLScrollListItem* mSelectedItem;
         LLFrameTimer mLastUpdateTimer;
 
         static std::map<LLUUID, AObjectDetails> sObjectDetails;
@@ -96,4 +100,17 @@ private:
         static std::string sSearchedGroup;
 
         static LLViewerRegion* sLastRegion;
+
+        LLHandle<LLView> mPopupMenuHandle;
+
+        class PopupMenuHandler : public LLMemberListener<JCFloaterAreaSearch>
+        {
+        public: PopupMenuHandler(const JCFloaterAreaSearch* instance);
+        
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        
+                const JCFloaterAreaSearch* mInstance;
+        };
+
+        class PopupMenuHandler* mPopupMenuHandler;
 };
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_areasearch.xml b/linden/indra/newview/skins/default/xui/en-us/menu_areasearch.xml
new file mode 100644
index 0000000..c55d1b3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_areasearch.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
+         mouse_opaque="false" name="popup" opaque="true" width="128">
+        <menu_item_call bottom_delta="-18" height="18" label="Teleport to" left="0"
+                 mouse_opaque="true" name="teleport" width="128">
+                <on_click function="Popup.HandleMenu" userdata="teleport" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Cam to" left="0"
+                 mouse_opaque="true" name="cam" width="128">
+                <on_click function="Popup.HandleMenu" userdata="cam" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Edit" left="0"
+                 mouse_opaque="true" name="edit" width="128">
+                <on_click function="Popup.HandleMenu" userdata="edit" />
+        </menu_item_call>
+</menu>