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

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
This commit is contained in:
Shyotl
2012-02-24 13:21:59 -06:00
parent 5c66c70546 0bdf54e6d9
commit a6a69caa4f
177 changed files with 9551 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
indra/newview/llviewermessage.cpp
View File

@@ -147,7 +147,6 @@
#include "llfloaterworldmap.h"
#include "llviewerdisplay.h"
#include "llkeythrottle.h"
#include "lltranslate.h"
// <edit>
#include "llviewernetwork.h"
// </edit>
@@ -165,7 +164,7 @@
#include "hippolimits.h"
#include "hipporestrequest.h"
#include "hippofloaterxml.h"
#include "llversionviewer.h"
#include "sgversion.h"
#include "m7wlinterface.h"
#include "llwlparammanager.h"
@@ -3251,6 +3250,7 @@ void process_decline_callingcard(LLMessageSystem* msg, void**)
LLNotificationsUtil::add("CallingCardDeclined");
}
#if 0 // Google translate doesn't work anymore
class ChatTranslationReceiver : public LLTranslate::TranslationReceiver
{
public :
@@ -3293,6 +3293,7 @@ private:
LLChat *m_chat;
const BOOL m_history;
};
#endif
void add_floater_chat(const LLChat &chat, const BOOL history)
{
@@ -3308,6 +3309,7 @@ void add_floater_chat(const LLChat &chat, const BOOL history)
}
}
#if 0 // Google translate doesn't work anymore
void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history)
{
const bool translate = LLUI::sConfigGroup->getBOOL("TranslateChat");
@@ -3328,6 +3330,7 @@ void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL hist
add_floater_chat(chat, history);
}
}
#endif
// defined in llchatbar.cpp, but not declared in any header
void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel);
@@ -3515,7 +3518,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// hello from object
if (from_id.isNull()) return;
char buf[200];
snprintf(buf, 200, "%s v%d.%d.%d", LL_CHANNEL, LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH);
snprintf(buf, 200, "%s v%d.%d.%d", gVersionChannel, gVersionMajor, gVersionMinor, gVersionPatch);
send_chat_from_viewer(buf, CHAT_TYPE_WHISPER, 427169570);
gChatObjectAuth[from_id] = 1;
} else if (gChatObjectAuth.find(from_id) != gChatObjectAuth.end()) {
@@ -3820,29 +3823,22 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
}
// truth table:
// LINDEN BUSY MUTED OWNED_BY_YOU TASK DISPLAY STORE IN HISTORY
// F F F F * Yes Yes
// F F F T * Yes Yes
// F F T F * No No
// F F T T * No No
// F T F F * No Yes
// F T F T * Yes Yes
// F T T F * No No
// F T T T * No No
// LINDEN MUTED BUSY OWNED_BY_YOU TASK DISPLAY STORE IN HISTORY
// F T * * * No No
// F F T F * No Yes
// * F F * * Yes Yes
// * F * T * Yes Yes
// T * * * F Yes Yes
chat.mMuted = is_muted && !is_linden;
if (!visible_in_chat_bubble
&& (is_linden || !is_busy || is_owned_by_me))
if (!chat.mMuted)
{
// show on screen and add to history
check_translate_chat(mesg, chat, FALSE);
}
else
{
// just add to chat history
check_translate_chat(mesg, chat, TRUE);
bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_busy);
#if 0 // Google translate doesn't work anymore
check_translate_chat(mesg, chat, only_history);
#else
add_floater_chat(chat, only_history);
#endif
}
}
}