From aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 15 Jan 2007 18:49:02 +0000 Subject: svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --- indra/newview/gpu_table.txt | 1 + indra/newview/llchatbar.cpp | 9 +++++++-- indra/newview/lldynamictexture.h | 2 +- indra/newview/llfolderview.cpp | 22 ++++++++++++---------- indra/newview/llinventorybridge.cpp | 1 + indra/newview/lljoystickbutton.h | 4 ++-- indra/newview/llpanelcontents.h | 2 +- indra/newview/llpreview.cpp | 7 +------ indra/newview/llpreviewtexture.cpp | 9 ++++++--- indra/newview/llselectmgr.cpp | 9 +++++++++ indra/newview/llviewermenu.cpp | 2 +- indra/newview/llviewertexteditor.cpp | 2 +- indra/newview/llviewerwindow.cpp | 9 +++++++-- indra/newview/llwearable.h | 4 ++-- 14 files changed, 52 insertions(+), 31 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index 1af40f8932..fae089486e 100644 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -75,6 +75,7 @@ NVIDIA GeForce 7300 .*NVIDIA.*GeForce 73.* 3 NVIDIA GeForce 7600 .*NVIDIA.*GeForce 76.* 3 NVIDIA GeForce 7800 .*NVIDIA.*GeForce 78.* 3 NVIDIA GeForce 7900 .*NVIDIA.*GeForce 79.* 3 +NVIDIA GeForce 8800 .*NVIDIA.*GeForce 88.* 3 NVIDIA GeForce FX 5100 .*NVIDIA.*GeForce FX 51.* 1 NVIDIA GeForce FX 5200 .*NVIDIA.*GeForce FX 52.* 1 NVIDIA GeForce FX 5500 .*NVIDIA.*GeForce FX 55.* 1 diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index e958bd2152..34c178f509 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -132,6 +132,11 @@ BOOL LLChatBar::postBuild() childSetAction("Say", onClickSay, this); childSetAction("Shout", onClickShout, this); childSetCommitCallback("Gesture", onCommitGesture, this); + LLButton * sayp = static_cast(getChildByName("Say")); + if(sayp) + { + setDefaultBtn(sayp); + } return TRUE; } @@ -271,8 +276,8 @@ void LLChatBar::refresh() gAgent.stopTyping(); } - childSetEnabled("Say", mInputEditor->getText().size()); - childSetEnabled("Shout", mInputEditor->getText().size()); + childSetEnabled("Say", mInputEditor->getText().size() > 0); + childSetEnabled("Shout", mInputEditor->getText().size() > 0); } diff --git a/indra/newview/lldynamictexture.h b/indra/newview/lldynamictexture.h index 6ff457e9a9..75a37aaa29 100644 --- a/indra/newview/lldynamictexture.h +++ b/indra/newview/lldynamictexture.h @@ -60,7 +60,7 @@ protected: LLCoordGL mOrigin; LLCamera mCamera; - static LLLinkedList LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ]; + static LLLinkedList sInstances[ LLDynamicTexture::ORDER_COUNT ]; static S32 sNumRenders; }; diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 3c0ba7ae28..cf041c4bfb 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -3242,18 +3242,20 @@ void LLFolderView::removeSelectedItems( void ) { new_selection = item_to_delete->getPreviousOpenNode(FALSE); } - if (new_selection) - { - setSelectionFromRoot(new_selection, new_selection->isOpen(), gViewerWindow->childHasKeyboardFocus(this)); - } - else - { - setSelectionFromRoot(NULL, gViewerWindow->childHasKeyboardFocus(this)); - } - if(parent) { - parent->removeItem(item_to_delete); + if (parent->removeItem(item_to_delete)) + { + // change selection on successful delete + if (new_selection) + { + setSelectionFromRoot(new_selection, new_selection->isOpen(), gViewerWindow->childHasKeyboardFocus(this)); + } + else + { + setSelectionFromRoot(NULL, gViewerWindow->childHasKeyboardFocus(this)); + } + } } arrangeAll(); } diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 47ab6e6b87..a0f098790f 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -676,6 +676,7 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model, LLInventoryObject* obj = model->getObject(mUUID); if(!obj) return; obj->removeFromServer(); + LLPreview::hide(mUUID); model->deleteObject(mUUID); model->notifyObservers(); } diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index a9a8acdfaf..8b0a5665d4 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -75,7 +75,7 @@ public: virtual void onHeldDown(); - static LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); + static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); }; @@ -96,7 +96,7 @@ public: virtual void onHeldDown(); virtual void onMouseUp(); - static LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); + static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); }; diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h index 273ab20bc7..7701a2a5f2 100644 --- a/indra/newview/llpanelcontents.h +++ b/indra/newview/llpanelcontents.h @@ -21,7 +21,7 @@ class LLSpinCtrl; class LLPanelContents : public LLPanel { public: - virtual BOOL LLPanelContents::postBuild(); + virtual BOOL postBuild(); LLPanelContents(const std::string& name); virtual ~LLPanelContents(); diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 82974da634..23f5b381ca 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -286,12 +286,7 @@ void LLPreview::hide(const LLUUID& item_uuid) if(found_it != LLPreview::sInstances.end()) { LLPreview* instance = found_it->second; - if( instance->getParent() ) - { - instance->getParent()->removeChild( instance ); - } - - delete instance; + instance->close(); } } diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index a50ded3b53..d1817c8cda 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -157,9 +157,12 @@ void LLPreviewTexture::init() { LLInventoryItem* item = getItem(); - childSetCommitCallback("desc", LLPreview::onText, this); - childSetText("desc", item->getDescription()); - childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe); + if (item) + { + childSetCommitCallback("desc", LLPreview::onText, this); + childSetText("desc", item->getDescription()); + childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe); + } } } diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index a2698763f0..8f4df36f59 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -3899,6 +3899,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point) return; } + BOOL build_mode = gToolMgr->inEdit(); // Special case: Attach to default location for this object. if (0 == attachment_point) { @@ -3908,6 +3909,10 @@ void LLSelectMgr::sendAttach(U8 attachment_point) packObjectIDAndRotation, &attachment_point, SEND_ONLY_ROOTS ); + if (!build_mode) + { + deselectAll(); + } } else { @@ -3945,6 +3950,10 @@ void LLSelectMgr::sendAttach(U8 attachment_point) packObjectIDAndRotation, &attachment_point, SEND_ONLY_ROOTS ); + if (!build_mode) + { + deselectAll(); + } } } } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8ab2b52a50..a305c1cfa4 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6828,7 +6828,6 @@ void near_attach_object(BOOL success, void *user_data) } gSelectMgr->sendAttach(attachment_id); - gSelectMgr->deselectTransient(); } class LLObjectAttachToAvatar : public view_listener_t @@ -6866,6 +6865,7 @@ void confirm_replace_attachment(S32 option, void* user_data) { if (option == 0/*YES*/) { + gSelectMgr->convertTransient(); LLViewerObject* selectedObject = gSelectMgr->getFirstRootObject(); if (selectedObject) { diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 16ba5d29ea..7d04f04528 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -386,7 +386,7 @@ void LLEmbeddedItems::markSaved() class LLTextCmdInsertEmbeddedItem : public LLTextCmd { public: - LLTextCmdInsertEmbeddedItem::LLTextCmdInsertEmbeddedItem( S32 pos, LLInventoryItem* item ) + LLTextCmdInsertEmbeddedItem( S32 pos, LLInventoryItem* item ) : LLTextCmd(pos, FALSE), mExtCharValue(0) { diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index df396c93be..74a239e827 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -899,6 +899,12 @@ void LLViewerWindow::handleFocusLost(LLWindow *window) } gFocusMgr.setMouseCapture( NULL, NULL ); + if (gMenuBarView) + { + // stop ALT-key access to menu + gMenuBarView->resetMenuTrigger(); + } + // restore mouse cursor gViewerWindow->showCursor(); gViewerWindow->getWindow()->setMouseClipping(FALSE); @@ -2671,8 +2677,7 @@ BOOL LLViewerWindow::handlePerFrameHover() if (gParcelMgr && !LLFloaterLand::floaterVisible() && !LLFloaterBuyLand::isOpen() - && (!gFloaterTools || !gFloaterTools->getVisible()) - && !gToolMgr) + && (!gFloaterTools || !gFloaterTools->getVisible())) { gParcelMgr->deselectLand(); } diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index d2dcd764d5..22572981a3 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -112,8 +112,8 @@ private: LLPtrSkipMap mVisualParamMap; // maps visual param id to weight LLPtrSkipMap mTEMap; // maps TE to Image ID - static const char* LLWearable::sTypeName[ WT_COUNT ]; - static const char* LLWearable::sTypeLabel[ WT_COUNT ]; + static const char* sTypeName[ WT_COUNT ]; + static const char* sTypeLabel[ WT_COUNT ]; }; #endif // LL_LLWEARABLE_H -- cgit v1.2.3