diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-02-20 22:02:36 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-02-20 22:02:36 +0000 |
| commit | 7dada07dbaae3dfb9b1319453e51019bfff2717f (patch) | |
| tree | a7f2b84ea65c39cee31474640dd5f265c0b2f432 /indra/llcommon | |
| parent | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (diff) | |
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llsecondlifeurls.cpp | 4 | ||||
| -rw-r--r-- | indra/llcommon/llsecondlifeurls.h | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 9eda175242..c13860033e 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -306,7 +306,7 @@ const U32 MAP_ITEM_TELEHUB = 0x01; const U32 MAP_ITEM_PG_EVENT = 0x02; const U32 MAP_ITEM_MATURE_EVENT = 0x03; const U32 MAP_ITEM_POPULAR = 0x04; -const U32 MAP_ITEM_AGENT_COUNT = 0x05; +//const U32 MAP_ITEM_AGENT_COUNT = 0x05; const U32 MAP_ITEM_AGENT_LOCATIONS = 0x06; const U32 MAP_ITEM_LAND_FOR_SALE = 0x07; const U32 MAP_ITEM_CLASSIFIED = 0x08; diff --git a/indra/llcommon/llsecondlifeurls.cpp b/indra/llcommon/llsecondlifeurls.cpp index 9d5395ad07..28f171a9c0 100644 --- a/indra/llcommon/llsecondlifeurls.cpp +++ b/indra/llcommon/llsecondlifeurls.cpp @@ -57,7 +57,5 @@ const char LSL_DOC_URL[] = const char SL_KB_URL[] = "http://secondlife.com/knowledgebase/"; -const char ACCOUNT_TRANSACTIONS_URL[] = - "https://secondlife.com/account/transactions.php"; - const char RELEASE_NOTES[] = "releasenotes.txt"; + diff --git a/indra/llcommon/llsecondlifeurls.h b/indra/llcommon/llsecondlifeurls.h index 86d18d0eab..b07c18eb72 100644 --- a/indra/llcommon/llsecondlifeurls.h +++ b/indra/llcommon/llsecondlifeurls.h @@ -55,9 +55,6 @@ extern const char LSL_DOC_URL[]; // SL KnowledgeBase page extern const char SL_KB_URL[]; -// Account transactions -extern const char ACCOUNT_TRANSACTIONS_URL[]; - // Local Url Release Notes extern const char RELEASE_NOTES[]; |