diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-06 15:08:41 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-06 15:08:41 -0500 |
commit | 344c46a20c8055daada15d70bf2dbd2cd5555be8 (patch) | |
tree | d7ff514786aa3b1347ad768a64b68bfd08e99f90 /indra/llmessage/llurlrequest.h | |
parent | 127f6d14050bd1d10b3a4b4b8a4c315da43e9f92 (diff) | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) |
merge, conflicts in llvertexbuffer.{h,cpp}
Diffstat (limited to 'indra/llmessage/llurlrequest.h')
-rw-r--r-- | indra/llmessage/llurlrequest.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h index ec5c2c1941..44d358d906 100644 --- a/indra/llmessage/llurlrequest.h +++ b/indra/llmessage/llurlrequest.h @@ -188,6 +188,8 @@ public: */ void allowCookies(); + /*virtual*/ bool isValid() ; + public: /** * @brief Give this pipe a chance to handle a generated error |