From 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 12 Aug 2008 17:29:50 +0000
Subject: QAR-767 Combined maint-render-7 and maint-viewer-9 merge merge
 release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated

---
 indra/llwindow/llwindow.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llwindow/llwindow.cpp')

diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 5f46b36c68..6b1cabc505 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -285,6 +285,12 @@ void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
 	}
 }
 
+void *LLWindow::getMediaWindow()
+{
+	// Default to returning the platform window.
+	return getPlatformWindow();
+}
+
 // static
 std::string LLWindow::getFontListSans()
 {
-- 
cgit v1.2.3