svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index cd915317ba..ee29876274 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -2523,9 +2523,9 @@ LLParcelSelection::LLParcelSelection() :
 	mParcel(NULL),
 	mSelectedMultipleOwners(FALSE),
 	mWholeParcelSelected(FALSE),
-	mSelectedPublicCount(0),
 	mSelectedSelfCount(0),
-	mSelectedOtherCount(0)
+	mSelectedOtherCount(0),
+	mSelectedPublicCount(0)
 {
 }
 
@@ -2533,9 +2533,9 @@ LLParcelSelection::LLParcelSelection(LLParcel* parcel)  :
 	mParcel(parcel),
 	mSelectedMultipleOwners(FALSE),
 	mWholeParcelSelected(FALSE),
-	mSelectedPublicCount(0),
 	mSelectedSelfCount(0),
-	mSelectedOtherCount(0)
+	mSelectedOtherCount(0),
+	mSelectedPublicCount(0)
 {
 }
 
@@ -2570,4 +2570,4 @@ LLParcelSelection* get_null_parcel_selection()
 {
 	static LLParcelSelectionHandle null_ptr = new LLParcelSelection();
 	return null_ptr;
-}
\ No newline at end of file
+}