Changeset 11054 for code/branches/cpp11_v3/src/orxonox/chat/ChatInputHandler.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/chat/ChatInputHandler.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/chat/ChatInputHandler.h

@@ -125 +125 @@
        * history window of the full chat window)
        */
-      void incomingChat(const std::string& message, const std::string& name);
+      virtual void incomingChat(const std::string& message, const std::string& name) override;
 
       /** \param full true means show full chat window with history,