diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
commit | 3e3fda589b11d53fceb9bbeed9f0333d88c3816f (patch) | |
tree | 43bfd5e88ede272242db36d9000fcdac84541725 /indra/llmessage | |
parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
parent | 70722454f6650438c9b659ff08b4d7bc6dfc2e7e (diff) |
merge up to 3.4.4-release
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | 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 e0dae376b4..febc59c4bc 100644 --- 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. |