diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 | ||||
| -rw-r--r-- | indra/newview/llfolderview.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
5 files changed, 6 insertions, 16 deletions
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 1b9fdbec5c..e622664aad 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 1.18.2.0"; -CFBundleGetInfoString = "Second Life version 1.18.2.0, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.18.3.2"; +CFBundleGetInfoString = "Second Life version 1.18.3.2, Copyright 2004-2007 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 87087f7bd9..f4ac5c6a61 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.18.2.0</string> + <string>1.18.3.2</string> <key>CSResourcesFileMapped</key> <true/> </dict> diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 20f00e297d..f0d6d2d0b1 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -699,15 +699,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask ) BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask ) { - if (mListener->getInventoryType() == LLInventoryType::IT_LANDMARK) - { - gFocusMgr.setKeyboardFocus(NULL, NULL); // release focus to main window so user can move with arrow keys - mListener->performAction(NULL, &gInventory, "teleport"); - } - else - { - preview(); - } + preview(); return TRUE; } diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 073d6cc088..c6f94841cb 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4229,7 +4229,8 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags) LLViewerInventoryItem* item = getItem(); if( !no_open && item ) { - no_open = (item->getType() == LLAssetType::AT_CLOTHING); + no_open = (item->getType() == LLAssetType::AT_CLOTHING) || + (item->getType() == LLAssetType::AT_BODYPART); } if (!no_open) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index a9eff5d5f5..b27d3d8742 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -73,7 +73,6 @@ #include "llimpanel.h" #include "llinventorymodel.h" #include "llinventoryview.h" -#include "llkeyframemotion.h" #include "llmenugl.h" #include "llmutelist.h" #include "llnetmap.h" @@ -2695,8 +2694,6 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) llinfos << "Changing home region to " << x << ":" << y << llendl; - LLKeyframeDataCache::clear(); - // set our upstream host the new simulator and shuffle things as // appropriate. LLVector3 shift_vector = regionp->getPosRegionFromGlobal( |