diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llinventoryactions.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp index 4535825..69202cb 100644 --- a/linden/indra/newview/llinventoryactions.cpp +++ b/linden/indra/newview/llinventoryactions.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -620,10 +620,11 @@ class LLBeginIMSession : public inventory_panel_listener_t | |||
620 | } | 620 | } |
621 | 621 | ||
622 | 622 | ||
623 | gIMMgr->addSession(name, | 623 | gIMMgr->addSession( |
624 | type, | 624 | name, |
625 | members[0], | 625 | type, |
626 | members); | 626 | members[0], |
627 | members); | ||
627 | 628 | ||
628 | return true; | 629 | return true; |
629 | } | 630 | } |
@@ -678,7 +679,7 @@ class LLAttachObject : public inventory_panel_listener_t | |||
678 | std::string(), | 679 | std::string(), |
679 | cb); | 680 | cb); |
680 | } | 681 | } |
681 | gFocusMgr.setKeyboardFocus(NULL, NULL); | 682 | gFocusMgr.setKeyboardFocus(NULL); |
682 | 683 | ||
683 | return true; | 684 | return true; |
684 | } | 685 | } |