Merge remote-tracking branch 'singu/master'

indra/newview/llappviewer.cpp

@@ -4694,6 +4694,14 @@ void LLAppViewer::handleLoginComplete()
 		gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
 	}
 
+	// After login is complete, check if the crash report has been sent in this session
+	// If it has, insert a notification
+	if (LLCrashLogger::sReportID)
+	{
+		LLNotificationsUtil::add("CrashReportSent", LLSD().with("REPORT_ID", llformat("%d", LLCrashLogger::sReportID)));
+		LLCrashLogger::sReportID = 0;
+	}
+
 	mOnLoginCompleted();
 
 	writeDebugInfo();

indra/newview/llcrashlogger.cpp

@@ -63,11 +63,17 @@ public:
 	virtual void result(const LLSD& content)
 	{
 		std::string msg = "Crash report successfully sent";
+
 		if (content.has("message"))
 		{
 			msg += ": " + content["message"].asString();
 		}
 		llinfos << msg << llendl;
+
+		if (content.has("report_id"))
+		{
+			LLCrashLogger::sReportID = content["report_id"].asInteger();
+		}
 	}
 
 	virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const 
@@ -93,6 +99,8 @@ LLCrashLogger::~LLCrashLogger()
 
 }
 
+/*static*/ S32 LLCrashLogger::sReportID = 0;
+
 // TRIM_SIZE must remain larger than LINE_SEARCH_SIZE.
 const int TRIM_SIZE = 128000;
 const int LINE_SEARCH_DIST = 500;

indra/newview/llcrashlogger.h

@@ -40,13 +40,14 @@ public:
 	LLCrashLogger();
 	virtual ~LLCrashLogger();
 	S32 loadCrashBehaviorSetting();
-    bool readDebugFromXML(LLSD& dest, const std::string& filename );
+	static S32 sReportID;
+	bool readDebugFromXML(LLSD& dest, const std::string& filename );
 	void gatherFiles();
-    void mergeLogs( LLSD src_sd );
+	void mergeLogs( LLSD src_sd );
 
 	virtual void gatherPlatformSpecificFiles() {}
 	bool saveCrashBehaviorSetting(S32 crash_behavior);
-    bool sendCrashLog(std::string dump_dir);
+	bool sendCrashLog(std::string dump_dir);
 	LLSD constructPostData();
 	void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; }
 	S32 getCrashBehavior() { return mCrashBehavior; }

indra/newview/llfloaterfriends.cpp

@@ -37,7 +37,7 @@
 
 #include "llfloaterfriends.h"
 
-
+#include "llsdutil_math.h"
 #include "llagent.h"
 #include "llavataractions.h"
 #include "llavatarnamecache.h"
@@ -426,6 +426,9 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
 	friend_column["value"] = fullname;
 	friend_column["font"] = "SANSSERIF";
 	friend_column["font-style"] = "NORMAL";	
+	static const LLCachedControl<LLColor4> sDefaultColor(gColors, "DefaultListText");
+	static const LLCachedControl<LLColor4> sMutedColor("AscentMutedColor");
+	friend_column["color"] = ll_sd_from_color4(LLAvatarActions::isBlocked(agent_id) ? sMutedColor : sDefaultColor);
 
 	LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];
 	online_status_column["column"] = "icon_online_status";

indra/newview/llfloatertools.cpp

@@ -1313,7 +1313,7 @@ void LLFloaterTools::getMediaState()
 		getChildView("media_tex")->setEnabled(bool_has_media && editable);
 		getChildView("edit_media")->setEnabled(bool_has_media && LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo && editable );
 		getChildView("delete_media")->setEnabled(bool_has_media && editable );
-		getChildView("add_media")->setEnabled(( ! bool_has_media ) && editable );
+		getChildView("add_media")->setEnabled(editable);
 			// TODO: display a list of all media on the face - use 'identical' flag
 	}
 	else // not all face has media but at least one does.
@@ -1343,7 +1343,7 @@ void LLFloaterTools::getMediaState()
 		getChildView("media_tex")->setEnabled(TRUE);
 		getChildView("edit_media")->setEnabled(LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo);
 		getChildView("delete_media")->setEnabled(TRUE);
-		getChildView("add_media")->setEnabled(FALSE );
+		getChildView("add_media")->setEnabled(editable);
 	}
 	media_info->setText(media_title);
 	
@@ -1353,6 +1353,8 @@ void LLFloaterTools::getMediaState()
 	if(mTitleMedia)
 		LLFloaterMediaSettings::initValues(mMediaSettings, editable );
 }
+
+
 //////////////////////////////////////////////////////////////////////////////
 // called when a user wants to add media to a prim or prim face
 void LLFloaterTools::onClickBtnAddMedia()

indra/newview/llgroupmgr.cpp

@@ -995,6 +995,11 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 					static std::string localized_online(LLTrans::getString("group_member_status_online"));
 					online_status = localized_online;
 				}
+				else if (online_status == "unknown")
+				{
+					static std::string localized_unknown(LLTrans::getString("group_member_status_unknown"));
+					online_status = localized_unknown;
+				}
 				else
 				{
 					formatDateString(online_status); // reformat for sorting, e.g. 12/25/2008 -> 2008/12/25
@@ -2058,6 +2063,8 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
 			online_status = member_info["last_login"].asString();
 			if (online_status == "Online")
 				online_status = LLTrans::getString("group_member_status_online");
+			else if (online_status == "unknown")
+				online_status = LLTrans::getString("group_member_status_unknown");
 			else
 				formatDateString(online_status);
 		}

indra/newview/llimpanel.cpp

@@ -867,7 +867,7 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 								  std::string& tooltip_msg)
 {
 
-	if (mDialog == IM_NOTHING_SPECIAL)
+	if (mSessionType == P2P_SESSION)
 	{
 		LLToolDragAndDrop::handleGiveDragAndDrop(mOtherParticipantUUID, mSessionUUID, drop,
 												 cargo_type, cargo_data, accept);
@@ -898,28 +898,23 @@ BOOL LLFloaterIMPanel::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 BOOL LLFloaterIMPanel::dropCallingCard(LLInventoryItem* item, BOOL drop)
 {
-	BOOL rv = isInviteAllowed();
+	if (item && item->getCreatorUUID().notNull())
-	if(rv && item && item->getCreatorUUID().notNull())
 	{
-		if(drop)
+		if (drop)
 		{
 			LLDynamicArray<LLUUID> ids;
 			ids.put(item->getCreatorUUID());
 			inviteToSession(ids);
 		}
+		return true;
 	}
-	else
+	// return false if creator uuid is null.
-	{
+	return false;
-		// set to false if creator uuid is null.
-		rv = FALSE;
-	}
-	return rv;
 }
 
 BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop)
 {
-	BOOL rv = isInviteAllowed();
+	if (category)
-	if(rv && category)
 	{
 		LLInventoryModel::cat_array_t cats;
 		LLInventoryModel::item_array_t items;
@@ -932,7 +927,7 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop)
 		S32 count = items.count();
 		if(count == 0)
 		{
-			rv = FALSE;
+			return false;
 		}
 		else if(drop)
 		{
@@ -944,14 +939,12 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop)
 			inviteToSession(ids);
 		}
 	}
-	return rv;
+	return true;
 }
 
 bool LLFloaterIMPanel::isInviteAllowed() const
 {
-
+	return mSessionType == ADHOC_SESSION;
-	return ( (IM_SESSION_CONFERENCE_START == mDialog) 
-			 || (IM_SESSION_INVITE == mDialog) );
 }
 
 void LLFloaterIMPanel::removeDynamics(LLComboBox* flyout)

indra/newview/llmediaremotectrl.cpp

@@ -279,6 +279,9 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 					LLChat chat;
 					chat.mText = getString("Now_playing") + " " + info_text;
 					chat.mSourceType = CHAT_SOURCE_SYSTEM;
+					// Lie to RLVa so it won't filter this
+					chat.mRlvLocFiltered = true;
+					chat.mRlvNamesFiltered = true;
 					LLFloaterChat::addChat(chat);
 				}
 			}

indra/newview/llviewermenu.cpp

@@ -9475,7 +9475,6 @@ class ListStartIM : public view_listener_t
 	}
 };
 
-/* Singu TODO: Figure out why this wouldn't work
 class ListAbuseReport : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9484,7 +9483,6 @@ class ListAbuseReport : public view_listener_t
 		return true;
 	}
 };
-*/
 
 // Create the args for administrative notifications used in lists, tossing the selected names into it.
 LLSD create_args(const uuid_vec_t& ids, const std::string& token)
@@ -9899,7 +9897,7 @@ void initialize_menus()
 	addMenu(new ListStartCall(), "List.StartCall");
 	addMenu(new ListStartConference(), "List.StartConference");
 	addMenu(new ListStartIM(), "List.StartIM");
-	//addMenu(new ListAbuseReport(), "List.AbuseReport");
+	addMenu(new ListAbuseReport(), "List.AbuseReport");
 	addMenu(new ListEject(), "List.ParcelEject");
 	addMenu(new ListFreeze(), "List.Freeze");
 	addMenu(new ListEstateBan(), "List.EstateBan");

indra/newview/llviewermessage.cpp

@@ -4018,7 +4018,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		std::string prefix = mesg.substr(0, 4);
 		if (prefix == "/me " || prefix == "/me'")
 		{
-			chat.mText = from_name;
+			chat.mText = chat.mFromName;
 			mesg = mesg.substr(3);
 			ircstyle = TRUE;
 			// This block was moved up to allow bubbles with italicized chat
@@ -4191,7 +4191,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				break;
 			}
 
-			chat.mText = from_name + verb + mesg;
+			chat.mText = chat.mFromName + verb + mesg;
 		}
 
 		if (chatter)

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

@@ -54,14 +54,14 @@
   </menu_item_call>
   <menu_item_separator/>
   <menu_item_call label="Mute/Unmute" name="Mute/Unmute">
-    <on_click function="List.Mute"/>
+    <on_click function="List.ToggleMute"/>
     <on_enable function="List.EnableMute"/>
     <on_visible function="List.EnableAnySelected"/>
   </menu_item_call>
-  <!--menu_item_call label="Report Abuse" name="Report Abuse">
+  <menu_item_call label="Report Abuse" name="Report Abuse">
-    <on_click function="List.ReportAbuse"/>
+    <on_click function="List.AbuseReport"/>
     <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call-->
+  </menu_item_call>
   <menu_item_call label="Copy Key" name="Copy Key">
     <on_click function="List.CopyUUIDs"/>
     <on_enable function="List.EnableAnySelected"/>

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

@@ -129,14 +129,14 @@
   </menu>
   <menu label="Moderation" name="Moderation" create_jump_keys="true">
     <menu_item_call label="Mute/Unmute" name="Mute/Unmute">
-      <on_click function="List.Mute"/>
+      <on_click function="List.ToggleMute"/>
       <on_enable function="List.EnableMute"/>
       <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
-    <!--menu_item_call label="Report Abuse" name="Report Abuse">
+    <menu_item_call label="Report Abuse" name="Report Abuse">
-      <on_click function="List.ReportAbuse"/>
+      <on_click function="List.AbuseReport"/>
       <on_visible function="List.EnableSingleSelected"/>
-    </menu_item_call-->
+    </menu_item_call>
     <menu_item_separator/>
     <menu_item_call label="Freeze" name="Freeze">
       <on_click function="List.Freeze"/>

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

@@ -9742,4 +9742,11 @@ Do you wish to export anyway?
 Object successfully exported to: [FILENAME]
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="CrashReportSent"
+   type="notifytip">
+Thank you for submitting the crash report! Report ID is [REPORT_ID]
+  </notification>
+
 </notifications>

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

@@ -4244,6 +4244,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="group_role_officers">Officers</string>
   <string name="group_role_owners">Owners</string>
   <string name="group_member_status_online">Online</string>
+  <string name="group_member_status_unknown">Unknown</string>
 
   <string name="uploading_abuse_report">Uploading...