summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterobjectweights.h
diff options
context:
space:
mode:
authorChris Baker <baker@lindenlab.com>2014-06-16 21:15:41 +0000
committerChris Baker <baker@lindenlab.com>2014-06-16 21:15:41 +0000
commitee14005a2aea89b2988fa0a5060f38b669e45389 (patch)
tree3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/llfloaterobjectweights.h
parenta92dbb592b338f48f7b75b68a9da511dc95279f9 (diff)
parent977476171ddcc057d7c28b6c14ae988b8189ed75 (diff)
viewer-release merge
Diffstat (limited to 'indra/newview/llfloaterobjectweights.h')
-rwxr-xr-xindra/newview/llfloaterobjectweights.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterobjectweights.h b/indra/newview/llfloaterobjectweights.h
index 9a244573be..1a2c317bad 100755
--- a/indra/newview/llfloaterobjectweights.h
+++ b/indra/newview/llfloaterobjectweights.h
@@ -63,7 +63,7 @@ public:
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onWeightsUpdate(const SelectionCost& selection_cost);
- /*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
+ /*virtual*/ void setErrorStatus(S32 status, const std::string& reason);
void updateLandImpacts(const LLParcel* parcel);
void refresh();