diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:52:30 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:52:30 +0000 |
| commit | 1713a3552b7017cbf781f2effd448f2e8cfb9372 (patch) | |
| tree | 1ffbfd1155ee84a9db937ba9cf1520c0248e6c92 /indra/newview/llchannelmanager.cpp | |
| parent | cf9814bc05f17e233e5d03e63fc2e519512b3e58 (diff) | |
merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160
* Changes: EXT-1139 (places context menu)
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index b4b680416c..c4619dc57a 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -77,7 +77,7 @@ LLScreenChannel* LLChannelManager::createNotificationChannel() p.channel_align = CA_RIGHT; // Getting a Channel for our notifications - return dynamic_cast<LLScreenChannel*> (LLChannelManager::getInstance()->createChannel(p)); + return dynamic_cast<LLScreenChannel*> (LLChannelManager::getInstance()->getChannel(p)); } //-------------------------------------------------------------------------- |