svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.

1 files changed, 53 insertions, 0 deletions

diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp
new file mode 100644
index 0000000000..f9e6c61272
--- /dev/null
+++ b/indra/newview/llremoteparcelrequest.cpp
@@ -0,0 +1,53 @@
+/**
+ * @file llparcelrequest.cpp
+ * @brief Implementation of the LLParcelRequest class.
+ *
+ * Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llagent.h"
+#include "llremoteparcelrequest.h"
+
+#include "llpanelplace.h"
+#include "llpanel.h"
+#include "llhttpclient.h"
+#include "llsdserialize.h"
+#include "llviewerregion.h"
+#include "llview.h"
+#include "message.h"
+
+LLRemoteParcelRequestResponder::LLRemoteParcelRequestResponder(LLViewHandle place_panel_handle)
+{
+	 mPlacePanelHandle = place_panel_handle;
+}
+/*virtual*/
+void LLRemoteParcelRequestResponder::result(const LLSD& content)
+{
+	LLUUID parcel_id = content["parcel_id"];
+
+	LLPanelPlace* place_panelp = (LLPanelPlace*)LLPanel::getPanelByHandle(mPlacePanelHandle);
+
+	if(place_panelp)
+	{
+		place_panelp->setParcelID(parcel_id);
+	}
+
+}
+
+/*virtual*/
+void LLRemoteParcelRequestResponder::error(U32 status, const std::string& reason)
+{
+	llinfos << "LLRemoteParcelRequest::error("
+		<< status << ": " << reason << ")" << llendl;
+	LLPanelPlace* place_panelp = (LLPanelPlace*)LLPanel::getPanelByHandle(mPlacePanelHandle);
+
+	if(place_panelp)
+	{
+		place_panelp->setErrorStatus(status, reason);
+	}
+
+}
+