diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-06-24 10:22:18 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-06-24 10:22:18 -0700 |
| commit | c8f8bbf75fbe6e5e6150b8979ecb063370a4e5dd (patch) | |
| tree | 89a4a7301b0a00054e4c2ed6a0a97ae466f3b630 | |
| parent | d161651cdb2ea8c3e73055cbf4a85510b8da56db (diff) | |
MAINT-6521: A compare against a static const empty string causes segfault in integration tests on Mac and Linux. Use empty() test instead.
| -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 |