diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-20 14:33:35 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-20 14:33:35 +0300 |
| commit | b4fe346fae7b0f7e3ca4f14277baa627eb899102 (patch) | |
| tree | 1c48f1a36610c4484229d0bd54e0fe7cf824047b /indra/llinventory | |
| parent | c28c2df676d2520b3f9e523385c0541df83a46b7 (diff) | |
| parent | 7fc07e1084b37db4477f6392ed11b9bda509b153 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index b08cb28218..d741cc855b 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -58,7 +58,6 @@ static const std::string PARCEL_OWNERSHIP_STATUS_STRING[LLParcel::OS_COUNT+1] = }; // NOTE: Adding parcel categories also requires updating: -// * floater_directory.xml category combobox // * floater_about_land.xml category combobox // * Web site "create event" tools // DO NOT DELETE ITEMS FROM THIS LIST WITHOUT DEEPLY UNDERSTANDING WHAT YOU'RE DOING. |