Merge branch 'master' of github.com:Beeks/Ascent

AscentChangelog.txt

@@ -1,5 +1,11 @@
 ->> Features implemented in Ascent:
+
 In-World:
+-------------------------------------------------
+* Alpha skins and Tattoo Layers
+* Inventory Pre-caching
+* Avatar Radar
+* Multiple Attachment Points
 * Idle time of avatars around you (Not perfect)
 * Client tags/coloring for various clients, and extra client definitions
 * Force Away button to fake being away if you really want to avoid someone :V
@@ -18,11 +24,49 @@ Communication Window:
 - Friend List:
   * Friend List Online/Total counts (Not perfect)
   * Shows what rights your friends have given you (Mod, See on map, Online)
+
+Chat Bar:
+* Emerald-style Chatbar as Commandline (See Preferences)
+* MU-style poses.
+* OOC Auto-close.
+
+Instant Messages:
+* MU-style poses.
+* OOC Auto-close.
+
+Advanced -> Ascent:
+* Fake Away Status
+* Force Ground Sit (Lets you sit anywhere)
+* Phantom Avatar (Prevents you visually from being pushed.)
+* Toggle IM Notification (Ability to hide '%n is typing...' notification from being sent.)
+* Close All Dialogs
+* Message Log
+* Message Builder
+* Sound Explorer
+* Asset Blacklist
+* AO options
+
+Object Pie Menus:
+* Measure: Select on one object, then another, to get the exact distance between the two
+* Data: Reports prim rotation and position in a format usable in LSL scripts.
+* Script Counter
+
+Self Pie Menu:
+* Animation Explorer
+
+Agent Pie Menus:
+* Script Counter
+* Copy Agent UUID
+* Debug
+
 Parcel Window:
+-------------------------------------------------
 - General tab:
 - Objects tab:
   * In Sim/Online/Offline indicators for Parcel Object Owner listings (Online is currently wonky - This is an issue with SL, Emerald has the same problem.)
+
 Build Window:
+-------------------------------------------------
 - General tab:
   * Last Owner shown in Build "General" Tab
   * Group object is set to has a "View" button to see the group's profile
@@ -35,5 +79,4 @@ Build Window:
 
 Known issues:
 Online/Total counts in the friends list sometimes go haywire. Not often or by a large margin, but it happens.
-Import/Export buttons don't work. Or they try to and break. Don't use 'em.
 Skin menu doesn't work - On hold until we actually have some skins to show - Ascent will have its own "branded" skin at some point.

indra/newview/llfloateravatarlist.cpp

@@ -824,10 +824,13 @@ void LLFloaterAvatarList::refreshAvatarList()
 			}
 			element["columns"][LIST_CLIENT]["value"] = client.c_str();
 
-			if(avatarp->extraMetadata.length())
-			{
-				element["columns"][LIST_METADATA]["value"] = avatarp->extraMetadata.c_str();
-			}
+			// <dogmode>
+			// Don't expose Emerald's metadata.
+
+			//if(avatarp->extraMetadata.length())
+			//{
+			//	element["columns"][LIST_METADATA]["value"] = avatarp->extraMetadata.c_str();
+			//}
 		}
 		else
 		{

indra/newview/lltexturectrl.cpp

@@ -484,13 +484,15 @@ BOOL LLFloaterTexturePicker::postBuild()
 {
 	LLFloater::postBuild();
 	
+	// <dogmode>
+	/**
 	LLInventoryItem* itemp = gInventory.getItem(mImageAssetID);
 	
-	if (itemp && !itemp->getPermissions().allowCopyBy(gAgent.getID()))
+	if (itemp && (itemp->getPermissions().getMaskOwner() & PERM_ALL))
 		childSetValue("texture_uuid", mImageAssetID);
 	else
 		childSetValue("texture_uuid", LLUUID::null.asString());
-
+	**/
 	if (!mLabel.empty())
 	{
 		std::string pick = getString("pick title");
@@ -829,6 +831,13 @@ void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem
 		self->mNoCopyTextureSelected = FALSE;
 		if (itemp)
 		{
+			// <dogmode>
+			if (itemp->getPermissions().getMaskOwner() & PERM_ALL)
+				self->childSetValue("texture_uuid", self->mImageAssetID);
+			else
+				self->childSetValue("texture_uuid", LLUUID::null.asString());
+			// </dogmode>
+
 			if (!itemp->getPermissions().allowCopyBy(gAgent.getID()))
 			{
 				self->mNoCopyTextureSelected = TRUE;

indra/newview/llviewermenu.cpp

@@ -2030,6 +2030,40 @@ class LLObjectInspect : public view_listener_t
 	}
 };
 
+// <dogmode> Derenderizer. Originally by Phox.
+class LLObjectDerender : public view_listener_t
+{
+    bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+    {
+		LLViewerObject* slct = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+		if(!slct)return true;
+		LLUUID id = slct->getID();
+		LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
+		LLUUID root_key;
+		LLSelectNode* node = selection->getFirstRootNode();
+		if(node)root_key = node->getObject()->getID();
+		if(root_key.notNull())
+		{
+			id = root_key;
+			//LLSelectMgr::getInstance()->removeObjectFromSelections(root_key);
+		}
+		LLSelectMgr::getInstance()->removeObjectFromSelections(id);
+
+		// ...don't kill the avatar
+		//if (!(id == gAgentID))
+		// <dogmode> Kill 'em all
+		if (true)
+		{
+			LLViewerObject *objectp = gObjectList.findObject(id);
+			if (objectp)
+			{
+				gObjectList.killObject(objectp);
+			}
+		}
+		return true;
+	}
+};
+
 
 //---------------------------------------------------------------------------
 // Land pie menu
@@ -9629,6 +9663,8 @@ void initialize_menus()
 	addMenu(new LLObjectBuy(), "Object.Buy");
 	addMenu(new LLObjectEdit(), "Object.Edit");
 	addMenu(new LLObjectInspect(), "Object.Inspect");
+	// <dogmode> Visual mute, originally by Phox.
+	addMenu(new LLObjectDerender(), "Object.DERENDER");
 
 	addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
 	addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");

indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml

@@ -23,6 +23,10 @@
 		<menu_item_call enabled="false" label="Data" mouse_opaque="true" name="Data">
     		<on_click function="Object.Data" />
 		</menu_item_call>
+    <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+      <on_click function="Object.DERENDER" />
+      <on_enable function="Object.EnableDerender" />
+    </menu_item_call>
 	</pie_menu>
 	<menu_item_call enabled="true" label="Stand Up" name="Stand Up">
 		<on_click function="Self.StandUp" userdata="" />

indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml

@@ -40,10 +40,6 @@
 			<on_click function="Avatar.Debug" />
 		</menu_item_call>
 		<pie_menu label="Tools &gt;" name="Tools &gt;">
-			<menu_item_call enabled="true" label="Safe Client" mouse_opaque="true" name="Safe Client">
-			<on_click function="Avatar.SafeClient" />
-			</menu_item_call>
-			<menu_item_separator />
 			<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
 				<on_click function="Object.ScriptCount" />
 				<on_visible function="Object.VisibleScriptCount" />
@@ -51,6 +47,9 @@
 			<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
 			 <on_click function="Avatar.CopyUUID" />
 			</menu_item_call>
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+        <on_click function="Object.DERENDER" />
+      </menu_item_call>
 		</pie_menu>
 		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
 			<on_click function="Object.Inspect" />

indra/newview/skins/default/xui/en-us/menu_pie_object.xml

@@ -71,6 +71,9 @@
       </menu_item_call>
       <menu_item_call enabled="true" hidden="false" label="Data" mouse_opaque="true" name="Data">
         <on_click function="Object.Data" />
+      </menu_item_call>
+      <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+        <on_click function="Object.DERENDER" />
       </menu_item_call>
 		</pie_menu>
 		<menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">

indra/newview/skins/default/xui/en-us/menu_pie_self.xml

@@ -71,15 +71,22 @@
 			<on_enable function="Self.EnableRemoveAllAttachments" />
 		</menu_item_call>
 	</pie_menu>
-	<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
-						 name="Anims...">
-		<on_click function="Avatar.Anims" />
-	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
-		<on_click function="Object.ScriptCount" />
-		<on_visible function="Object.VisibleScriptCount" />
-	</menu_item_call>
-	<menu_item_separator />
+  <pie_menu label="Tools &gt;" name="Tools &gt;">
+	  <menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
+						   name="Anims...">
+		  <on_click function="Avatar.Anims" />
+	  </menu_item_call>
+	  <menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
+		  <on_click function="Object.ScriptCount" />
+		  <on_visible function="Object.VisibleScriptCount" />
+	  </menu_item_call>
+    <menu_item_call enabled="true" label="Debug..." mouse_opaque="true" name="Debug Layers">
+      <on_click function="Avatar.Debug" />
+    </menu_item_call>
+    <menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
+      <on_click function="Avatar.CopyUUID" />
+    </menu_item_call>
+  </pie_menu>
 	<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
 		<on_click function="ShowFloater" userdata="gestures" />
 	</menu_item_call>
@@ -87,7 +94,4 @@
 		<on_click function="ShowFloater" userdata="appearance" />
 		<on_enable function="Edit.EnableCustomizeAvatar" />
 	</menu_item_call>
-	<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
-		 <on_click function="Avatar.CopyUUID" />
-	</menu_item_call>
 </pie_menu>