From 62f5a65ec6f172a3448d57687b16044636841abe Mon Sep 17 00:00:00 2001 From: CharleyLevenque Date: Mon, 23 Aug 2010 02:11:43 -0400 Subject: [PATCH 1/4] Don't let the Radar display Emerald's privacy-invading metadata. --- indra/newview/llfloateravatarlist.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 7a1bc0793..cd6347a65 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/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(); - } + // + // Don't expose Emerald's metadata. + + //if(avatarp->extraMetadata.length()) + //{ + // element["columns"][LIST_METADATA]["value"] = avatarp->extraMetadata.c_str(); + //} } else { From 018a82931934d750bee88a8e76bb6240d24c500c Mon Sep 17 00:00:00 2001 From: CharleyLevenque Date: Mon, 23 Aug 2010 02:20:03 -0400 Subject: [PATCH 2/4] Feature list updated. --- AscentChangelog.txt | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/AscentChangelog.txt b/AscentChangelog.txt index 1aee2b439..d815846e3 100644 --- a/AscentChangelog.txt +++ b/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. \ No newline at end of file From 3bdfec7ed56f97a2d49d21e82ba617184937e37f Mon Sep 17 00:00:00 2001 From: CharleyLevenque Date: Mon, 23 Aug 2010 03:18:09 -0400 Subject: [PATCH 3/4] Made UUID viewer on the Texture Picker panel TPV-compliant. --- indra/newview/lltexturectrl.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index e8698933e..a6144cb9e 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -484,13 +484,15 @@ BOOL LLFloaterTexturePicker::postBuild() { LLFloater::postBuild(); + // + /** 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::dequemNoCopyTextureSelected = FALSE; if (itemp) { + // + if (itemp->getPermissions().getMaskOwner() & PERM_ALL) + self->childSetValue("texture_uuid", self->mImageAssetID); + else + self->childSetValue("texture_uuid", LLUUID::null.asString()); + // + if (!itemp->getPermissions().allowCopyBy(gAgent.getID())) { self->mNoCopyTextureSelected = TRUE; From c26050a1ec9cb5102df0fc34117ea57f3f407ba5 Mon Sep 17 00:00:00 2001 From: CharleyLevenque Date: Mon, 23 Aug 2010 04:13:03 -0400 Subject: [PATCH 4/4] Added in Emerald's 'Derender' option on objects and avatars, tidied up avatar, object and self pie menu xml. --- indra/newview/llviewermenu.cpp | 36 +++++++++++++++++++ .../default/xui/en-us/menu_pie_attachment.xml | 4 +++ .../default/xui/en-us/menu_pie_avatar.xml | 7 ++-- .../default/xui/en-us/menu_pie_object.xml | 3 ++ .../skins/default/xui/en-us/menu_pie_self.xml | 28 ++++++++------- 5 files changed, 62 insertions(+), 16 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 4f1fda058..db0eaf79a 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2030,6 +2030,40 @@ class LLObjectInspect : public view_listener_t } }; +// Derenderizer. Originally by Phox. +class LLObjectDerender : public view_listener_t +{ + bool handleEvent(LLPointer 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)) + // 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"); + // Visual mute, originally by Phox. + addMenu(new LLObjectDerender(), "Object.DERENDER"); addMenu(new LLObjectEnableOpen(), "Object.EnableOpen"); addMenu(new LLObjectEnableTouch(), "Object.EnableTouch"); diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml index cd0cec71e..5aface602 100644 --- a/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml +++ b/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml @@ -23,6 +23,10 @@ + + + + diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml index 909b133ca..be3c21ac3 100644 --- a/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml +++ b/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml @@ -40,10 +40,6 @@ - - - - diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/indra/newview/skins/default/xui/en-us/menu_pie_object.xml index 64f4fd02a..707941556 100644 --- a/indra/newview/skins/default/xui/en-us/menu_pie_object.xml +++ b/indra/newview/skins/default/xui/en-us/menu_pie_object.xml @@ -71,6 +71,9 @@ + + diff --git a/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/indra/newview/skins/default/xui/en-us/menu_pie_self.xml index fc4293429..983e4b31d 100644 --- a/indra/newview/skins/default/xui/en-us/menu_pie_self.xml +++ b/indra/newview/skins/default/xui/en-us/menu_pie_self.xml @@ -71,15 +71,22 @@ - - - + + + + + + + + + + @@ -87,7 +94,4 @@ - - -