livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge 

--HG--
branch : product-engine
Ychebotarev ProductEngine 2010-01-20 19:07:04 +02:00
parent e761c0ece7 9c277d95b6
commit a498bf958c
5 changed files with 46 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -3664,17 +3664,6 @@
<key>Value</key>
<string />
</map>
<key>IMInChat</key>
<map>
<key>Comment</key>
<string>Copy IM into chat console</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>IMShowTimestamps</key>
<map>
<key>Comment</key>

16
indra/newview/llfloaterchat.cpp
View File

@ -311,7 +311,7 @@ void LLFloaterChat::onClickToggleShowMute(LLUICtrl* caller, void *data)
}
// Put a line of chat in all the right places
void LLFloaterChat::addChat(const LLChat& chat, BOOL from_instant_message, BOOL local_agent)
void LLFloaterChat::addChat(const LLChat& chat, BOOL local_agent)
{
triggerAlerts(chat.mText);
@ -321,19 +321,7 @@ void LLFloaterChat::addChat(const LLChat& chat, BOOL from_instant_message, BOOL
//if(chat.mSourceType == CHAT_SOURCE_AGENT && chat.mFromID.notNull())
// LLRecentPeople::instance().add(chat.mFromID);
bool add_chat = true;
bool log_chat = true;
if(from_instant_message)
{
if (!gSavedSettings.getBOOL("IMInChat"))
add_chat = false;
//log_chat = false;
}
if (add_chat)
{
addChatHistory(chat, log_chat);
}
addChatHistory(chat, true);
}
// Moved from lltextparser.cpp to break llui/llaudio library dependency.

2
indra/newview/llfloaterchat.h
View File

@ -61,7 +61,7 @@ public:
// *TODO:Skinning - move these to LLChat (or LLViewerChat?)
// Add chat to console and history list.
// Color based on source, type, distance.
static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE);
static void addChat(const LLChat& chat, BOOL local_agent = FALSE);
// Add chat to history alone.
static void addChatHistory(const LLChat& chat, bool log_to_file = true);

86
indra/newview/llviewermenu.cpp
View File

@ -6373,57 +6373,57 @@ class LLToolsSelectedScriptAction : public view_listener_t
void handle_selected_texture_info(void*)
{
for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
{
LLSelectNode* node = *iter;
std::string msg;
msg.assign("Texture info for: ");
msg.append(node->mName);
for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
{
LLSelectNode* node = *iter;
std::string msg;
msg.assign("Texture info for: ");
msg.append(node->mName);
//TODO* CHAT: how to show this?
//LLSD args;
//args["MESSAGE"] = msg;
//LLNotificationsUtil::add("SystemMessage", args);
U8 te_count = node->getObject()->getNumTEs();
// map from texture ID to list of faces using it
typedef std::map< LLUUID, std::vector<U8> > map_t;
map_t faces_per_texture;
for (U8 i = 0; i < te_count; i++)
{
if (!node->isTESelected(i)) continue;
LLViewerTexture* img = node->getObject()->getTEImage(i);
LLUUID image_id = img->getID();
faces_per_texture[image_id].push_back(i);
}
// Per-texture, dump which faces are using it.
map_t::iterator it;
for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)
{
LLUUID image_id = it->first;
U8 te = it->second[0];
LLViewerTexture* img = node->getObject()->getTEImage(te);
S32 height = img->getHeight();
S32 width = img->getWidth();
S32 components = img->getComponents();
msg = llformat("%dx%d %s on face ",
width,
height,
(components == 4 ? "alpha" : "opaque"));
for (U8 i = 0; i < it->second.size(); ++i)
{
msg.append( llformat("%d ", (S32)(it->second[i])));
}
U8 te_count = node->getObject()->getNumTEs();
// map from texture ID to list of faces using it
typedef std::map< LLUUID, std::vector<U8> > map_t;
map_t faces_per_texture;
for (U8 i = 0; i < te_count; i++)
{
if (!node->isTESelected(i)) continue;
LLViewerTexture* img = node->getObject()->getTEImage(i);
LLUUID image_id = img->getID();
faces_per_texture[image_id].push_back(i);
}
// Per-texture, dump which faces are using it.
map_t::iterator it;
for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)
{
LLUUID image_id = it->first;
U8 te = it->second[0];
LLViewerTexture* img = node->getObject()->getTEImage(te);
S32 height = img->getHeight();
S32 width = img->getWidth();
S32 components = img->getComponents();
msg = llformat("%dx%d %s on face ",
width,
height,
(components == 4 ? "alpha" : "opaque"));
for (U8 i = 0; i < it->second.size(); ++i)
{
msg.append( llformat("%d ", (S32)(it->second[i])));
}
//TODO* CHAT: how to show this?
//LLSD args;
//args["MESSAGE"] = msg;
//LLNotificationsUtil::add("SystemMessage", args);
}
}
}
}
}
void handle_test_male(void*)

11
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -1603,17 +1603,6 @@
function="ToggleControl"
parameter="MouseSmooth" />
</menu_item_check>
<menu_item_check
label="Show IMs in Nearby Chat"
layout="topleft"
name="IMInChat">
<menu_item_check.on_check
function="CheckControl"
parameter="IMInChat" />
<menu_item_check.on_click
function="ToggleControl"
parameter="IMInChat" />
</menu_item_check>
<menu_item_separator
layout="topleft" />
<menu