Merge

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp
index 2ba28bd4bf..52ab766f7f 100644
--- a/indra/media_plugins/webkit/linux_volume_catcher.cpp
+++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp
@@ -398,7 +398,8 @@ void callback_subscription_alert(pa_context *context, pa_subscription_event_type
 			impl->mSinkInputIndices.erase(index);
 			impl->mSinkInputNumChannels.erase(index);
 		}
-		else
+		else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) ==
+			 PA_SUBSCRIPTION_EVENT_NEW)
 		{
 			// ask for more info about this new sinkinput
 			pa_operation *op;
@@ -407,6 +408,10 @@ void callback_subscription_alert(pa_context *context, pa_subscription_event_type
 				llpa_operation_unref(op);
 			}
 		}
+		else
+		{
+			// property change on this sinkinput - we don't care.
+		}
 		break;
 		
 	default:;