summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-14 16:38:12 -0400
committerOz Linden <oz@lindenlab.com>2014-03-14 16:38:12 -0400
commitd6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch)
tree8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/llwindow
parentbc7a579ba285fa64876a2bc116685f0357fe25dc (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llwindow')
-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();
}
/*