2 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 2196ba201b..21afcae7c3 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -531,6 +531,15 @@ void LLUICtrl::setControlVariable(LLControlVariable* control)
 	}
 }
 
+void LLUICtrl::removeControlVariable()
+{
+    if (mControlVariable)
+    {
+        mControlConnection.disconnect();
+        mControlVariable = NULL;
+    }
+}
+
 //virtual
 void LLUICtrl::setControlName(const std::string& control_name, LLView *context)
 {
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 67dd24341c..be1c7dd0b6 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -175,6 +175,7 @@ public:
 	bool setControlValue(const LLSD& value);
 	void setControlVariable(LLControlVariable* control);
 	virtual void setControlName(const std::string& control, LLView *context = NULL);
+    void removeControlVariable();
 	
 	LLControlVariable* getControlVariable() { return mControlVariable; }