svn merge -r 83778:83944 maint-ui-10-merge

QAR-442

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/llwindow/lldxhardware.h b/indra/llwindow/lldxhardware.h
index e2a255da76..e174b322b0 100644
--- a/indra/llwindow/lldxhardware.h
+++ b/indra/llwindow/lldxhardware.h
@@ -85,6 +85,7 @@ class LLDXHardware
 {
 public:
 	LLDXHardware();
+
 	void setWriteDebugFunc(void (*func)(const char*));
 	void cleanup();
 
@@ -100,12 +101,12 @@ public:
 	// Empty strings indicate that you don't care.
 	// You can separate multiple devices with '|' chars to indicate you want
 	// ANY of them to match and return.
-	LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
+	// LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
 
-	LLString dumpDevices();
+	// LLString dumpDevices();
 public:
 	typedef std::map<std::string, LLDXDevice *> device_map_t;
-	device_map_t mDevices;
+	// device_map_t mDevices;
 protected:
 	S32 mVRAM;
 };