diff options
author | Oz Linden <oz@lindenlab.com> | 2013-07-29 15:19:54 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-07-29 15:19:54 -0400 |
commit | 91f7d0d1540ae448b45d8eceacff8aad2b88462a (patch) | |
tree | 2f7b7505be398189252a7d2148869c81268ebc6d /indra/llmessage | |
parent | de3d3cf8aac904e0afda356d14af61b44cdb5fb7 (diff) | |
parent | 8a761f92275a853fce28cf19ea628acdce840779 (diff) |
merge changes for storm-1838
Diffstat (limited to 'indra/llmessage')
-rwxr-xr-x | indra/llmessage/llinstantmessage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h index db4a38ea9e..f7118f8ccf 100755 --- a/indra/llmessage/llinstantmessage.h +++ b/indra/llmessage/llinstantmessage.h @@ -126,7 +126,7 @@ enum EInstantMessage IM_LURE_ACCEPTED = 23, IM_LURE_DECLINED = 24, IM_GODLIKE_LURE_USER = 25, - IM_YET_TO_BE_USED = 26, + IM_TELEPORT_REQUEST = 26, // IM that notifie of a new group election. // Name is name of person who called vote. |