svn merge -r 54741:56417 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew

Picking up some interestlist cleanup that passed testing.
master
Andrew Meadows 2007-01-03 19:16:05 +00:00
parent 420b91db29
commit 2b291c2732
1 changed files with 23 additions and 22 deletions

View File

@ -1,23 +1,24 @@
/** /**
* @file indra_constants.h * @file indra_constants.h
* @brief some useful short term constants for Indra * @brief some useful short term constants for Indra
* *
* Copyright (c) 2001-$CurrentYear$, Linden Research, Inc. * Copyright (c) 2001-$CurrentYear$, Linden Research, Inc.
* $License$ * $License$
*/ */
#ifndef LL_AVATAR_CONSTANTS_H #ifndef LL_AVATAR_CONSTANTS_H
#define LL_AVATAR_CONSTANTS_H #define LL_AVATAR_CONSTANTS_H
// If this string is passed to dataserver in AvatarPropertiesUpdate // If this string is passed to dataserver in AvatarPropertiesUpdate
// then no change is made to user.profile_web // then no change is made to user.profile_web
const char* const BLACKLIST_PROFILE_WEB_STR = "featureWebProfilesDisabled"; const char* const BLACKLIST_PROFILE_WEB_STR = "featureWebProfilesDisabled";
// If profile web pages are feature blacklisted then this URL is // If profile web pages are feature blacklisted then this URL is
// shown in the profile instead of the user's set URL // shown in the profile instead of the user's set URL
const char* const BLACKLIST_PROFILE_WEB_URL = "http://secondlife.com/app/webdisabled"; const char* const BLACKLIST_PROFILE_WEB_URL = "http://secondlife.com/app/webdisabled";
// Maximum number of avatar picks // Maximum number of avatar picks
const S32 MAX_AVATAR_PICKS = 10; const S32 MAX_AVATAR_PICKS = 10;
#endif #endif