diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/llmessage/lltemplatemessagereader.h | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llmessage/lltemplatemessagereader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llmessage/lltemplatemessagereader.h b/linden/indra/llmessage/lltemplatemessagereader.h index 98f41ae..ff124f3 100644 --- a/linden/indra/llmessage/lltemplatemessagereader.h +++ b/linden/indra/llmessage/lltemplatemessagereader.h | |||
| @@ -109,7 +109,8 @@ public: | |||
| 109 | 109 | ||
| 110 | bool isTrusted() const; | 110 | bool isTrusted() const; |
| 111 | bool isBanned(bool trusted_source) const; | 111 | bool isBanned(bool trusted_source) const; |
| 112 | 112 | bool isUdpBanned() const; | |
| 113 | |||
| 113 | private: | 114 | private: |
| 114 | 115 | ||
| 115 | void getData(const char *blockname, const char *varname, void *datap, | 116 | void getData(const char *blockname, const char *varname, void *datap, |