diff options
| author | Jonathan Yap <none@none> | 2013-02-01 17:30:37 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-02-01 17:30:37 -0500 |
| commit | c8533650b4779040c5e196f9ff156e3454edc9c8 (patch) | |
| tree | b941aa6173fdd2d2901cdd3d63b4fd1d035cfcc7 | |
| parent | 9de2371f157fa7f62b1c91949fb05b45f18c9812 (diff) | |
STORM-1838 Remove IM button
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8d4fab4e9f..69b278ee8d 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6909,14 +6909,8 @@ bool teleport_request_callback(const LLSD& notification, const LLSD& response) case 1: default: break; - - // IM - case 2: - { - LLAvatarActions::startIM(from_id); - } - break; } + return false; } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0026555781..dba84b6c6b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6554,10 +6554,6 @@ Offer a teleport? index="1" name="No" text="No"/> - <button - index="2" - name="IM" - text="IM"/> </form> </notification> |