Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 17:26:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2833 from stojce/19597

Browse source 
fixed mention sounds dir for deployment
This commit is contained in:
AndrewMeadows 2014-05-12 14:33:21 -07:00
commit 3e78d63e34
5 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
interface/resources/sounds/mention/Mentioned A.wav → interface/resources/mention-sounds/Mentioned A.wav
View file

0
interface/resources/sounds/mention/Mentioned B.wav → interface/resources/mention-sounds/Mentioned B.wav
View file

0
interface/resources/sounds/mention/Mentioned C.wav → interface/resources/mention-sounds/Mentioned C.wav
View file

2
interface/src/XmppClient.cpp
View file

@ -16,7 +16,7 @@
#include "XmppClient.h"
const QString DEFAULT_XMPP_SERVER = "chat.highfidelity.io";
const QString DEFAULT_CHAT_ROOM = "test@public-chat.highfidelity.io";
const QString DEFAULT_CHAT_ROOM = "public@public-chat.highfidelity.io";
XmppClient::XmppClient() :
_xmppClient(),

2
interface/src/ui/ChatWindow.cpp
View file

@ -32,7 +32,7 @@ const int NUM_MESSAGES_TO_TIME_STAMP = 20;
const QRegularExpression regexLinks("((?:(?:ftp)|(?:https?)|(?:hifi))://\\S+)");
const QRegularExpression regexHifiLinks("([#@]\\S+)");
const QString mentionSoundsPath("/sounds/mention/");
const QString mentionSoundsPath("/mention-sounds/");
const QString mentionRegex("@(\\b%1\\b)");
ChatWindow::ChatWindow(QWidget* parent) :