From 1713a3552b7017cbf781f2effd448f2e8cfb9372 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 1 Oct 2009 17:52:30 +0000 Subject: 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) --- indra/newview/llchannelmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchannelmanager.cpp') 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 (LLChannelManager::getInstance()->createChannel(p)); + return dynamic_cast (LLChannelManager::getInstance()->getChannel(p)); } //-------------------------------------------------------------------------- -- cgit v1.3