summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llassetstorage.cpp3
-rw-r--r--indra/llmessage/llinstantmessage.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 4d10f1e3da..2966b602d7 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -1210,6 +1210,9 @@ const char* LLAssetStorage::getErrorString(S32 status)
case LL_ERR_CIRCUIT_GONE:
return "Circuit gone";
+ case LL_ERR_PRICE_MISMATCH:
+ return "Viewer and server do not agree on price";
+
default:
return "Unknown status";
}
diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h
index 774349036d..96a2cf9cab 100644
--- a/indra/llmessage/llinstantmessage.h
+++ b/indra/llmessage/llinstantmessage.h
@@ -159,7 +159,7 @@ enum EInstantMessage
IM_FRIENDSHIP_OFFERED = 38,
IM_FRIENDSHIP_ACCEPTED = 39,
- IM_FRIENDSHIP_DECLINED = 40,
+ IM_FRIENDSHIP_DECLINED_DEPRECATED = 40,
IM_TYPING_START = 41,
IM_TYPING_STOP = 42,