diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
| commit | 029130bf9c76139fa836117987b60e801ac7ec7c (patch) | |
| tree | ee320f7737ad3edc74a2401b5bd20a027b670487 /indra/llcommon | |
| parent | 0aac2f674e4bd2fc73025ec8b649739cf7be3e4c (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llbase32.cpp | 12 | ||||
| -rw-r--r-- | indra/llcommon/llchat.h | 3 | ||||
| -rw-r--r-- | indra/llcommon/lllslconstants.h | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/indra/llcommon/llbase32.cpp b/indra/llcommon/llbase32.cpp index 711ba63ea2..96e4d76f3b 100644 --- a/indra/llcommon/llbase32.cpp +++ b/indra/llcommon/llbase32.cpp @@ -6,6 +6,12 @@ * Based on code from bitter * http://ghostwhitecrab.com/bitter/ * + * Some parts of this file are: + * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc. + * $License$ + */ + +/** * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de> * All rights reserved. * @@ -192,6 +198,8 @@ base32_decode(char *dst, size_t size, const void *data, size_t len) */ +// The following is +// Copyright (c) 2007-$CurrentYear$, Linden Research, Inc. // static std::string LLBase32::encode(const U8* input, size_t input_size) { @@ -207,8 +215,8 @@ std::string LLBase32::encode(const U8* input, size_t input_size) size_t encoded = base32_encode(&output[0], output_size, input, input_size); - llinfos << "encoded " << encoded << " into buffer of size " << output_size - << llendl; + llinfos << "encoded " << encoded << " into buffer of size " + << output_size << llendl; } return output; } diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h index 88867b2081..61bdc81907 100644 --- a/indra/llcommon/llchat.h +++ b/indra/llcommon/llchat.h @@ -29,7 +29,8 @@ typedef enum e_chat_type CHAT_TYPE_SHOUT = 2, CHAT_TYPE_START = 4, CHAT_TYPE_STOP = 5, - CHAT_TYPE_DEBUG_MSG = 6 + CHAT_TYPE_DEBUG_MSG = 6, + CHAT_TYPE_REGION = 7 } EChatType; typedef enum e_chat_audible_level diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h index bd14e8ce04..87234a463c 100644 --- a/indra/llcommon/lllslconstants.h +++ b/indra/llcommon/lllslconstants.h @@ -55,6 +55,7 @@ const S32 LSL_PRIM_TYPE_SPHERE = 3; const S32 LSL_PRIM_TYPE_TORUS = 4; const S32 LSL_PRIM_TYPE_TUBE = 5; const S32 LSL_PRIM_TYPE_RING = 6; +const S32 LSL_PRIM_TYPE_SCULPT = 7; const S32 LSL_PRIM_HOLE_DEFAULT = 0x00; const S32 LSL_PRIM_HOLE_CIRCLE = 0x10; @@ -97,6 +98,11 @@ const S32 LSL_PRIM_BUMP_STUCCO = 15; const S32 LSL_PRIM_BUMP_SUCTION = 16; const S32 LSL_PRIM_BUMP_WEAVE = 17; +const S32 LSL_PRIM_SCULPT_TYPE_SPHERE = 1; +const S32 LSL_PRIM_SCULPT_TYPE_TORUS = 2; +const S32 LSL_PRIM_SCULPT_TYPE_PLANE = 3; +const S32 LSL_PRIM_SCULPT_TYPE_CYLINDER = 4; + const S32 LSL_ALL_SIDES = -1; const S32 LSL_LINK_ROOT = 1; const S32 LSL_LINK_FIRST_CHILD = 2; |