summaryrefslogtreecommitdiff
path: root/indra/test/message_tut.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-06-18 11:32:53 -0700
committerAura Linden <aura@lindenlab.com>2014-06-18 11:32:53 -0700
commita4d60d6721c62511ba7a26352e3b5d35cd0dbb94 (patch)
tree082fa1927273936fa07b9b500a7a3548833cbb6f /indra/test/message_tut.cpp
parent4bcf2079f15a09d40f1d7aa61b2768cc54dc427a (diff)
parent977476171ddcc057d7c28b6c14ae988b8189ed75 (diff)
Pulled merge from release.
Diffstat (limited to 'indra/test/message_tut.cpp')
-rwxr-xr-xindra/test/message_tut.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp
index 4c0463c65c..57e423e550 100755
--- a/indra/test/message_tut.cpp
+++ b/indra/test/message_tut.cpp
@@ -45,6 +45,7 @@ namespace
mStatus = code;
}
virtual void extendedResult(S32 code, const std::string& message, const LLSD& headers) { }
+ virtual void extendedResult(S32 code, const LLSD& result, const LLSD& headers) { }
S32 mStatus;
};
}
@@ -141,7 +142,7 @@ namespace tut
const LLSD message;
const LLPointer<Response> response = new Response();
gMessageSystem->dispatch(name, message, response);
- ensure_equals(response->mStatus, 404);
+ ensure_equals(response->mStatus, HTTP_NOT_FOUND);
}
}