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/lib | |
| 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 'linden/indra/lib')
| -rw-r--r-- | linden/indra/lib/python/indra/ipc/llmessage.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/lib/python/indra/ipc/llmessage.py b/linden/indra/lib/python/indra/ipc/llmessage.py index f73f604..446679d 100644 --- a/linden/indra/lib/python/indra/ipc/llmessage.py +++ b/linden/indra/lib/python/indra/ipc/llmessage.py | |||
| @@ -86,7 +86,8 @@ class Message: | |||
| 86 | NOTDEPRECATED = "NotDeprecated" | 86 | NOTDEPRECATED = "NotDeprecated" |
| 87 | DEPRECATED = "Deprecated" | 87 | DEPRECATED = "Deprecated" |
| 88 | UDPDEPRECATED = "UDPDeprecated" | 88 | UDPDEPRECATED = "UDPDeprecated" |
| 89 | deprecations = [ NOTDEPRECATED, UDPDEPRECATED, DEPRECATED ] | 89 | UDPBLACKLISTED = "UDPBlackListed" |
| 90 | deprecations = [ NOTDEPRECATED, UDPDEPRECATED, UDPBLACKLISTED, DEPRECATED ] | ||
| 90 | # in order of increasing deprecation | 91 | # in order of increasing deprecation |
| 91 | 92 | ||
| 92 | def __init__(self, name, number, priority, trust, coding): | 93 | def __init__(self, name, number, priority, trust, coding): |