summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-25 12:00:00 -0700
committerMerov Linden <merov@lindenlab.com>2014-03-25 12:00:00 -0700
commit54bba824228162724a1d46d9c7900e9aa7a077a3 (patch)
tree3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/llwindow
parentf813a25224081e68d4772676909d2cff14407486 (diff)
parent78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff)
Pull merge from lindenlab/viewer-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();
}
/*