diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterauction.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp index db169a8..8e7124a 100644 --- a/linden/indra/newview/llfloaterauction.cpp +++ b/linden/indra/newview/llfloaterauction.cpp | |||
@@ -102,26 +102,27 @@ void LLFloaterAuction::show() | |||
102 | sInstance->setFocus(TRUE); | 102 | sInstance->setFocus(TRUE); |
103 | } | 103 | } |
104 | sInstance->initialize(); | 104 | sInstance->initialize(); |
105 | sInstance->open(); | 105 | sInstance->open(); /*Flawfinder: ignore*/ |
106 | } | 106 | } |
107 | 107 | ||
108 | void LLFloaterAuction::initialize() | 108 | void LLFloaterAuction::initialize() |
109 | { | 109 | { |
110 | LLParcel* parcel = gParcelMgr->getSelectedParcel(); | 110 | mParcelp = gParcelMgr->getParcelSelection(); |
111 | LLViewerRegion* region = gParcelMgr->getSelectionRegion(); | 111 | LLViewerRegion* region = gParcelMgr->getSelectionRegion(); |
112 | if(parcel && region && !parcel->getForSale()) | 112 | LLParcel* parcelp = mParcelp->getParcel(); |
113 | if(parcelp && region && !parcelp->getForSale()) | ||
113 | { | 114 | { |
114 | mParcelHost = region->getHost(); | 115 | mParcelHost = region->getHost(); |
115 | mParcelID = parcel->getLocalID(); | 116 | mParcelID = parcelp->getLocalID(); |
116 | 117 | ||
117 | childSetText("parcel_text", parcel->getName()); | 118 | childSetText("parcel_text", parcelp->getName()); |
118 | childEnable("snapshot_btn"); | 119 | childEnable("snapshot_btn"); |
119 | childEnable("ok_btn"); | 120 | childEnable("ok_btn"); |
120 | } | 121 | } |
121 | else | 122 | else |
122 | { | 123 | { |
123 | mParcelHost.invalidate(); | 124 | mParcelHost.invalidate(); |
124 | if(parcel && parcel->getForSale()) | 125 | if(parcelp && parcelp->getForSale()) |
125 | { | 126 | { |
126 | childSetText("parcel_text", childGetText("already for sale")); | 127 | childSetText("parcel_text", childGetText("already for sale")); |
127 | } | 128 | } |