From da68d3a57ecb27eba5d7efb8ff77d9640c0be65e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:44:57 -0500 Subject: Second Life viewer sources 1.16.0.5 --- linden/indra/llcommon/llbase32.cpp | 32 +- linden/indra/llcommon/llchat.h | 3 +- linden/indra/llcommon/llcommon_vc8.vcproj | 1522 +++++++++++++++-------------- linden/indra/llcommon/lllslconstants.h | 6 + linden/indra/llcommon/llversion.h | 6 +- 5 files changed, 804 insertions(+), 765 deletions(-) (limited to 'linden/indra/llcommon') diff --git a/linden/indra/llcommon/llbase32.cpp b/linden/indra/llcommon/llbase32.cpp index 711ba63..27f7284 100644 --- a/linden/indra/llcommon/llbase32.cpp +++ b/linden/indra/llcommon/llbase32.cpp @@ -6,6 +6,32 @@ * Based on code from bitter * http://ghostwhitecrab.com/bitter/ * + * Some parts of this file are: + * Copyright (c) 2007-2007, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlife.com/developers/opensource/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlife.com/developers/opensource/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + */ + +/** * Copyright (c) 2006 Christian Biere * All rights reserved. * @@ -192,6 +218,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 +235,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/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h index b1635a7..bb2610b 100644 --- a/linden/indra/llcommon/llchat.h +++ b/linden/indra/llcommon/llchat.h @@ -49,7 +49,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/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj index 0a34543..15371f5 100644 --- a/linden/indra/llcommon/llcommon_vc8.vcproj +++ b/linden/indra/llcommon/llcommon_vc8.vcproj @@ -1,759 +1,763 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h index 59d1cc8..afe4a9e 100644 --- a/linden/indra/llcommon/lllslconstants.h +++ b/linden/indra/llcommon/lllslconstants.h @@ -75,6 +75,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; @@ -117,6 +118,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; diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h index a76551d..f2ea20d 100644 --- a/linden/indra/llcommon/llversion.h +++ b/linden/indra/llcommon/llversion.h @@ -30,8 +30,8 @@ #define LL_LLVERSION_H const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 15; -const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 3; +const S32 LL_VERSION_MINOR = 16; +const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_BUILD = 5; #endif -- cgit v1.1