diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-26 13:58:19 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-26 13:58:19 -0400 |
| commit | 0bcfbde3a4265d7963ea501622e512de8eab7f61 (patch) | |
| tree | 9947dc73b2be9bc6bb4907938b67bf5c3fee4d09 /indra/newview/llinventorybridge.cpp | |
| parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) | |
EXT-6536 : Make LLVOAvatarSelf a singleton
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index da21939a61..2d544f53f4 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1507,7 +1507,7 @@ BOOL LLFolderBridge::isItemRemovable() const } LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(!avatarp) + if (!avatarp) { return FALSE; } @@ -1662,7 +1662,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, if(!model) return FALSE; LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(!avatarp) return FALSE; + if (!avatarp) return FALSE; // cannot drag categories into library if(!isAgentInventory()) @@ -3027,7 +3027,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, } LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(!avatarp) return FALSE; + if (!avatarp) return FALSE; LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource(); BOOL accept = FALSE; @@ -4269,7 +4269,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) if(item) { LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if( !avatarp ) + if (!avatarp) { return; } @@ -4355,7 +4355,7 @@ BOOL LLObjectBridge::renameItem(const std::string& new_name) model->notifyObservers(); LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(avatarp) + if (avatarp) { LLViewerObject* obj = avatarp->getWornAttachment( item->getUUID() ); if(obj) |