diff options
author | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
commit | ec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch) | |
tree | 01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/llinventory/llparcel.cpp | |
parent | c2785a740eb98d28ba705c981f4b6b289501d2e5 (diff) | |
parent | b7cd89da5f74663a9fd547af77afaed06cdb05fd (diff) |
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
-rw-r--r-- | indra/llinventory/llparcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index a871bcbb25..37c603348e 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -205,7 +205,7 @@ void LLParcel::init(const LLUUID &owner_id, mAABBMin.setVec(SOME_BIG_NUMBER, SOME_BIG_NUMBER, SOME_BIG_NUMBER); mAABBMax.setVec(SOME_BIG_NEG_NUMBER, SOME_BIG_NEG_NUMBER, SOME_BIG_NEG_NUMBER); - mLocalID = 0; + mLocalID = INVALID_PARCEL_ID; //mSimWidePrimCorrection = 0; setMaxPrimCapacity((S32)(sim_object_limit * area / (F32)(REGION_WIDTH_METERS * REGION_WIDTH_METERS))); |