summaryrefslogtreecommitdiff
path: root/indra/llmessage/llareslistener.cpp
diff options
context:
space:
mode:
authorCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:22:44 -0600
committerCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:22:44 -0600
commit7e0bc07e5cd72cfb7c55c964a73d9d8c9e9e5988 (patch)
treee847d23a8642323ef63df22a9426f1524d4da796 /indra/llmessage/llareslistener.cpp
parent4f7b8a7e861ee25f1e0f7b0df2e9c8372254f46d (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/llmessage/llareslistener.cpp')
-rwxr-xr-xindra/llmessage/llareslistener.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llmessage/llareslistener.cpp b/indra/llmessage/llareslistener.cpp
index 58b8a05a9e..0a4effac19 100755
--- a/indra/llmessage/llareslistener.cpp
+++ b/indra/llmessage/llareslistener.cpp
@@ -93,5 +93,12 @@ private:
void LLAresListener::rewriteURI(const LLSD& data)
{
- mAres->rewriteURI(data["uri"], new UriRewriteResponder(data));
+ if (mAres)
+ {
+ mAres->rewriteURI(data["uri"], new UriRewriteResponder(data));
+ }
+ else
+ {
+ llinfos << "LLAresListener::rewriteURI requested without Ares present. Ignoring: " << data << llendl;
+ }
}