Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-26 00:36:43 +01:00
parent 9c29488044 98d5e4bea8
commit 38248ac5b3
10 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloaterfriends.cpp
View File

@@ -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"] = LLAvatarActions::isBlocked(agent_id) ? sMutedColor : sDefaultColor;
LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];
online_status_column["column"] = "icon_online_status";

6
indra/newview/llfloatertools.cpp
View File

@@ -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()

7
indra/newview/llgroupmgr.cpp
View File

@@ -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);
}

27
indra/newview/llimpanel.cpp
View File

@@ -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(rv && item && item->getCreatorUUID().notNull())
if (item && item->getCreatorUUID().notNull())
{
if(drop)
if (drop)
{
LLDynamicArray<LLUUID> ids;
ids.put(item->getCreatorUUID());
inviteToSession(ids);
}
return true;
}
else
{
// set to false if creator uuid is null.
rv = FALSE;
}
return rv;
// return false if creator uuid is null.
return false;
}
BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop)
{
BOOL rv = isInviteAllowed();
if(rv && category)
if (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 ( (IM_SESSION_CONFERENCE_START == mDialog)
|| (IM_SESSION_INVITE == mDialog) );
return mSessionType == ADHOC_SESSION;
}
void LLFloaterIMPanel::removeDynamics(LLComboBox* flyout)

3
indra/newview/llmediaremotectrl.cpp
View File

@@ -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);
}
}

4
indra/newview/llviewermenu.cpp
View File

@@ -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");

4
indra/newview/llviewermessage.cpp
View File

@@ -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)

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

@@ -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">
<on_click function="List.ReportAbuse"/>
<menu_item_call label="Report Abuse" name="Report Abuse">
<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"/>

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

@@ -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">
<on_click function="List.ReportAbuse"/>
<menu_item_call label="Report Abuse" name="Report Abuse">
<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"/>

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

@@ -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...