summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt2
-rw-r--r--indra/newview/llfloaterworldmap.cpp2
-rw-r--r--indra/newview/llfloaterworldmap.h2
-rw-r--r--indra/newview/llshareavatarhandler.cpp1
-rw-r--r--indra/newview/llvoicecallhandler.cpp2
5 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 69bc82eb65..26ba35e093 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -405,7 +405,7 @@ set(viewer_SOURCE_FILES
llsidepanelinventorysubpanel.cpp
llsidepaneliteminfo.cpp
llsidepaneltaskinfo.cpp
- llsidetray.cpp
+ llsidetray.cpp
llsidetraypanelcontainer.cpp
llsky.cpp
llslurl.cpp
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 0c99cc1c8e..8683f03788 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -1154,7 +1154,7 @@ void LLFloaterWorldMap::onAvatarComboCommit()
}
}
-void LLFloaterWorldMap::avatarTrackFromSlapp( const LLUUID& id )
+void LLFloaterWorldMap::avatarTrackFromSlapp( const LLUUID& id )
{
trackAvatar( id, "av" );
onShowTargetBtn();
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 5e4768d92b..5ac62e27fc 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -110,7 +110,7 @@ public:
//Slapp instigated avatar tracking
- void avatarTrackFromSlapp( const LLUUID& id );
+ void avatarTrackFromSlapp( const LLUUID& id );
protected:
void onGoHome();
diff --git a/indra/newview/llshareavatarhandler.cpp b/indra/newview/llshareavatarhandler.cpp
index 517990c06f..34194970b8 100644
--- a/indra/newview/llshareavatarhandler.cpp
+++ b/indra/newview/llshareavatarhandler.cpp
@@ -25,6 +25,7 @@
*/
#include "llviewerprecompiledheaders.h"
+#include "llcommandhandler.h"
#include "llavataractions.h"
class LLShareWithAvatarHandler : public LLCommandHandler
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp
index fe50a05f1c..274bd75208 100644
--- a/indra/newview/llvoicecallhandler.cpp
+++ b/indra/newview/llvoicecallhandler.cpp
@@ -25,7 +25,7 @@
*/
#include "llviewerprecompiledheaders.h"
-#include "llcommandhandler.h"
+#include "llcommandhandler.h"
#include "llavataractions.h"
class LLVoiceCallAvatarHandler : public LLCommandHandler