svn merge -r 54741:56417 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew
Picking up some interestlist cleanup that passed testing.master
parent
420b91db29
commit
2b291c2732
|
|
@ -21,3 +21,4 @@ const char* const BLACKLIST_PROFILE_WEB_URL = "http://secondlife.com/app/webdisa
|
||||||
const S32 MAX_AVATAR_PICKS = 10;
|
const S32 MAX_AVATAR_PICKS = 10;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue