diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 6e07e2b03..ed436c432 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -980,17 +980,18 @@ void LLPanelRegionDebugInfo::onClickTopScripts(void* data)
 // static
 void LLPanelRegionDebugInfo::onClickRestart(void* data)
 {
+	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
 	LLNotificationsUtil::add("ConfirmRestart", LLSD(), LLSD(), 
-		boost::bind(&LLPanelRegionDebugInfo::callbackRestart, (LLPanelRegionDebugInfo*)data, _1, _2));
+		boost::bind(&LLPanelRegionDebugInfo::callbackRestart, (LLPanelRegionDebugInfo*)data, _1, _2, self->getChild<LLSpinCtrl>("rcount")->getValue().asInteger()));
 }
 
-bool LLPanelRegionDebugInfo::callbackRestart(const LLSD& notification, const LLSD& response)
+bool LLPanelRegionDebugInfo::callbackRestart(const LLSD& notification, const LLSD& response, S32 seconds)
 {
 	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
 	if (option != 0) return false;
 
 	strings_t strings;
-	strings.push_back("120");
+	strings.push_back(llformat("%d",seconds));
 	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
 	sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);
 	return false;
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 6289e9396..c5ec3b7d6 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -195,7 +195,7 @@ protected:
 	static void onClickTopColliders(void*);
 	static void onClickTopScripts(void*);
 	static void onClickRestart(void* data);
-	bool callbackRestart(const LLSD& notification, const LLSD& response);
+	bool callbackRestart(const LLSD& notification, const LLSD& response, S32 seconds);
 	static void onClickCancelRestart(void* data);
 	
 private:
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 51ac59cbb..2293cdb91 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3693,7 +3693,7 @@ Does this group contain Mature content?
    label="Confirm restart"
    name="ConfirmRestart"
    type="alert">
-Do you really want to restart this region in 2 minutes?
+Do you really want to restart this region?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
diff --git a/indra/newview/skins/default/xui/en-us/panel_region_debug.xml b/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index 91a81dfa6..c0dfdbf3e 100644
--- a/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
@@ -66,12 +66,15 @@
 	     width="150" />
 	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
 	     left="170" name="top_scripts_help" width="18" />
-	<button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
+  <button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
 	     left="10" name="restart_btn"
-	     tool_tip="Give 2 minute countdown and restart region" width="130" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="150" name="restart_help" width="18" />
-	<button bottom_delta="-23" follows="left|top" height="20" label="Delay Restart"
+	     tool_tip="Give x second countdown and restart region" width="130" />
+  <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
+             increment="1" initial_val="120" left_delta="135" max_val="3600" min_val="15"
+             mouse_opaque="true" name="rcount" label="Seconds:" label_width="50" width="105" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="255" name="restart_help" width="18" />
+  <button bottom_delta="-23" follows="left|top" height="20" label="Delay Restart"
 	     left="10" name="cancel_restart_btn"
 	     tool_tip="Delay region restart by one hour" width="130" />
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 3e3ca522b..a2e729fe5 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1600,7 +1600,7 @@ Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
 		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification label="Confirmer le redémarrage" name="ConfirmRestart">
-		Souhaitez-vous vraiment redémarrer cette région dans 2 minutes ?
+		Souhaitez-vous vraiment redémarrer cette région ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification label="Envoyer un message à la région" name="MessageRegion">