summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-10-05 22:46:30 -0700
committerMerov Linden <merov@lindenlab.com>2011-10-05 22:46:30 -0700
commitfc5030fcfe9d3ffcbb2ad1ae0b1dacd1699a54ce (patch)
treea1a6f0aabfdbee631c8c802aef1656551a3fa32a /indra/newview
parent55d2e0020b62f64133151c70adc3acc084685e3e (diff)
EXP-1286 : Clean-up the mess I added to llcommandmanager. All CommandId now have a trusted UUID which is the base for indexing and comparison.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltoolbarview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index c0408e4850..95ed603bbf 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -373,7 +373,8 @@ BOOL LLToolBarView::handleDrop( void* cargo_data, S32 x, S32 y, LLToolBar* toolb
//llinfos << "Merov debug : handleDrop. Drop source is a widget -> drop it in place..." << llendl;
// Get the command from its uuid
LLCommandManager& mgr = LLCommandManager::instance();
- LLCommand* command = mgr.getCommand(inv_item->getUUID());
+ LLCommandId command_id(inv_item->getUUID());
+ LLCommand* command = mgr.getCommand(command_id);
if (command)
{
// Convert the (x,y) position in rank in toolbar