summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicechannel.h
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-13 15:17:20 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-13 15:17:20 +0100
commit5ee2fc381d8f215fd397d258cf52038ddda8771d (patch)
treeab9546159cdc2a99bba411e163607dee4968e07f /indra/newview/llvoicechannel.h
parenteea99519d4f7a479e1cb7fabcdc9845c27314fb4 (diff)
parentf3df31078c48c5a98ce47bf04a14a1938da3bdc8 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llvoicechannel.h')
-rw-r--r--indra/newview/llvoicechannel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 573fab1f4f..074f9b8bba 100644
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -113,7 +113,7 @@ protected:
void doSetState(const EState& state);
void setURI(std::string uri);
- // there can be two directions ICOMING and OUTGOING
+ // there can be two directions INCOMING and OUTGOING
EDirection mCallDirection;
std::string mURI;