diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-06-24 22:07:24 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-06-24 22:07:24 +0300 |
| commit | 7b1af4caa90d8b6ffefe3731d6e7b74c498b5bd2 (patch) | |
| tree | 6f680962008fce885a84f443ad2d07afc8d525e2 | |
| parent | babbc9cf681de34d7647a6133fbecf28a1adb346 (diff) | |
| parent | c51b4720935e157f1cd9a1940cdd0608f96c95c9 (diff) | |
Merged in rider_linden/viewer-bear (pull request #13)
MAINT-6521: A compare against a static const empty string causes segfault in integration tests on Mac and Linux.
| -rw-r--r-- | indra/llcommon/llevents.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp index 0e36741616..e38fc5b2a6 100644 --- a/indra/llcommon/llevents.cpp +++ b/indra/llcommon/llevents.cpp @@ -320,7 +320,7 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL // if the supplied name is empty we are not interested in the ordering mechanism // and can bypass attempting to find the optimal location to insert the new // listener. We'll just tack it on to the end. - if (name != ANONYMOUS) + if (!name.empty()) // should be the same as testing against ANONYMOUS { // Check for duplicate name before connecting listener to mSignal ConnectionMap::const_iterator found = mConnections.find(name); @@ -464,7 +464,7 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLEventL // connect it. LLBoundListener bound = mSignal->connect(nodePosition, listener); - if (name != ANONYMOUS) + if (!name.empty()) { // note that we are not tracking anonymous listeners here either. // This means that it is the caller's responsibility to either assign // to a TempBoundListerer (scoped_connection) or manually disconnect |