summaryrefslogtreecommitdiff
path: root/indra/llwindow/lldxhardware.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-03-10 20:34:43 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-03-10 20:34:43 -0400
commit9c29000ba2f8192985ad0bf20889739ad12dd569 (patch)
tree3670a18100453ef589a04d40da5aa314b99f5d11 /indra/llwindow/lldxhardware.cpp
parent71e237a3f79cd90b432205460fe6e5c6b536d9db (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge. Refresh from viewer-release after 3.7.3 release.
Diffstat (limited to 'indra/llwindow/lldxhardware.cpp')
-rwxr-xr-xindra/llwindow/lldxhardware.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index 3579b5d42f..b0f4bc5503 100755
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -171,6 +171,7 @@ std::string LLDXDriverFile::dump()
LLDXDevice::~LLDXDevice()
{
for_each(mDriverFiles.begin(), mDriverFiles.end(), DeletePairedPointer());
+ mDriverFiles.clear();
}
std::string LLDXDevice::dump()
@@ -230,6 +231,7 @@ LLDXHardware::LLDXHardware()
void LLDXHardware::cleanup()
{
// for_each(mDevices.begin(), mDevices.end(), DeletePairedPointer());
+ // mDevices.clear();
}
/*