Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http

1 files changed, 36 insertions, 3 deletions

diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 87ada5ac6b..ecbb20df1b 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -307,6 +307,15 @@ public:
 	bool applyToRootNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
 	bool applyToNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
 
+	/*
+	 * Used to apply (no-copy) textures to the selected object or
+	 * selected face/faces of the object.
+	 * This method moves (no-copy) texture to the object's inventory
+	 * and doesn't make copy of the texture for each face.
+	 * Then this only texture is used for all selected faces.
+	 */
+	void applyNoCopyTextureToTEs(LLViewerInventoryItem* item);
+
 	ESelectType getSelectType() const { return mSelectType; }
 
 private:
@@ -501,7 +510,6 @@ public:
 	void selectionUpdatePhysics(BOOL use_physics);
 	void selectionUpdateTemporary(BOOL is_temporary);
 	void selectionUpdatePhantom(BOOL is_ghost);
-	void selectionUpdateCastShadows(BOOL cast_shadows);
 	void selectionDump();
 
 	BOOL selectionAllPCode(LLPCode code);		// all objects have this PCode
@@ -539,8 +547,6 @@ public:
 	void selectionTexScaleAutofit(F32 repeats_per_meter);
 	void adjustTexturesByScale(BOOL send_to_sim, BOOL stretch);
 
-	void selectionResetRotation();				// sets rotation quat to identity
-	void selectionRotateAroundZ(F32 degrees);
 	bool selectionMove(const LLVector3& displ, F32 rx, F32 ry, F32 rz,
 					   U32 update_type);
 	void sendSelectionMove();
@@ -563,6 +569,33 @@ public:
 	BOOL selectGetRootsModify();
 	BOOL selectGetModify();
 
+	// returns TRUE if is all objects are non-permanent-enforced
+	BOOL selectGetRootsNonPermanentEnforced();
+	BOOL selectGetNonPermanentEnforced();
+
+	// returns TRUE if is all objects are permanent
+	BOOL selectGetRootsPermanent();
+	BOOL selectGetPermanent();
+
+	// returns TRUE if is all objects are character
+	BOOL selectGetRootsCharacter();
+	BOOL selectGetCharacter();
+
+	// returns TRUE if is all objects are not permanent
+	BOOL selectGetRootsNonPathfinding();
+	BOOL selectGetNonPathfinding();
+
+	// returns TRUE if is all objects are not permanent
+	BOOL selectGetRootsNonPermanent();
+	BOOL selectGetNonPermanent();
+
+	// returns TRUE if is all objects are not character
+	BOOL selectGetRootsNonCharacter();
+	BOOL selectGetNonCharacter();
+
+	BOOL selectGetEditableLinksets();
+	BOOL selectGetViewableCharacters();
+
 	// returns TRUE if selected objects can be transferred.
 	BOOL selectGetRootsTransfer();