Second Life viewer sources 1.19.1.0

1 files changed, 9 insertions, 7 deletions

diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 9cb107c..0f1ea4c 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -272,7 +272,7 @@ public:
         void updateEffects();
         void cleanupNodes();
 
-        BOOL isEmpty();
+        BOOL isEmpty() const;
 
         S32 getOwnershipCost(S32 &cost);
 
@@ -331,7 +331,7 @@ private:
         ESelectType mSelectType;
 };
 
-typedef LLHandle<LLObjectSelection> LLObjectSelectionHandle;
+typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
 
 class LLSelectMgr : public LLEditMenuHandler
 {
@@ -360,20 +360,20 @@ public:
         static void cleanupGlobals();
 
         // LLEditMenuHandler interface
-        virtual BOOL canUndo();
+        virtual BOOL canUndo() const;
         virtual void undo();
 
-        virtual BOOL canRedo();
+        virtual BOOL canRedo() const;
         virtual void redo();
 
-        virtual BOOL canDoDelete();
+        virtual BOOL canDoDelete() const;
         virtual void doDelete();
 
         virtual void deselect();
-        virtual BOOL canDeselect();
+        virtual BOOL canDeselect() const;
 
         virtual void duplicate();
-        virtual BOOL canDuplicate();
+        virtual BOOL canDuplicate() const;
 
         void clearSelections();
         void update();
@@ -486,6 +486,7 @@ public:
         BOOL selectionAllPCode(LLPCode code);           // all objects have this PCode
         BOOL selectionGetClickAction(U8 *out_action);
         bool selectionGetIncludeInSearch(bool* include_in_search_out); // true if all selected objects have same
+        BOOL selectionGetGlow(F32 *glow);
 
         void selectionSetMaterial(U8 material);
         void selectionSetImage(const LLUUID& imageid); // could be item or asset id
@@ -501,6 +502,7 @@ public:
         void selectionSetMediaTypeAndURL( U8 media_type, const std::string& media_url );
         void selectionSetClickAction(U8 action);
         void selectionSetIncludeInSearch(bool include_in_search);
+        void selectionSetGlow(const F32 glow);
 
         void selectionSetObjectPermissions(U8 perm_field, BOOL set, U32 perm_mask, BOOL override = FALSE);
         void selectionSetObjectName(const LLString& name);