From 7c207214b86dc5675e2d136cc34e9b209209dc4b Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:17 -0500 Subject: Second Life viewer sources 1.18.5.1-RC --- linden/doc/contributions.txt | 2 + linden/indra/llcommon/llpreprocessor.h | 2 +- linden/indra/llcommon/llversionviewer.h | 2 +- .../indra/newview/English.lproj/InfoPlist.strings | 4 +- linden/indra/newview/Info-SecondLife.plist | 2 +- linden/indra/newview/llcontroldef.cpp | 12 +- linden/indra/newview/llfloaterdirectory.cpp | 33 +++- linden/indra/newview/llfloaterdirectory.h | 3 + linden/indra/newview/llnotify.cpp | 3 +- linden/indra/newview/llpaneldirfind.cpp | 137 +++++++------- linden/indra/newview/llpanelpermissions.cpp | 18 +- linden/indra/newview/llurldispatcher.cpp | 2 +- linden/indra/newview/llviewermenu.cpp | 2 +- .../newview/macview.xcodeproj/project.pbxproj | 41 +++- linden/indra/newview/postbuild.bat | 206 ++++++++++----------- linden/indra/newview/releasenotes.txt | 11 ++ linden/indra/newview/res/newViewRes.rc | 8 +- .../newview/skins/xui/en-us/menu_inventory.xml | 2 +- linden/indra/newview/viewer.cpp | 2 +- 19 files changed, 284 insertions(+), 208 deletions(-) (limited to 'linden') diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 7a9a457..897977c 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt @@ -32,6 +32,8 @@ Alissa Sabre VWR-1410 VWR-2116 VWR-2826 +Angus Boyd + VWR-592 Argent Stonecutter VWR-68 Benja Kepler diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h index 459d086..4509e73 100644 --- a/linden/indra/llcommon/llpreprocessor.h +++ b/linden/indra/llcommon/llpreprocessor.h @@ -125,7 +125,7 @@ #define BOOST_REGEX_NO_LIB 1 #define CURL_STATICLIB 1 -#define LL_LCD_COMPILE 1 +//#define LL_LCD_COMPILE 0 #endif // LL_WINDOWS diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 8d87e13..e3a4df1 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; const S32 LL_VERSION_PATCH = 5; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 1; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index 794fe0d..a25f977 100644 --- a/linden/indra/newview/English.lproj/InfoPlist.strings +++ b/linden/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.5.0"; -CFBundleGetInfoString = "Second Life version 1.18.5.0, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.18.5.1"; +CFBundleGetInfoString = "Second Life version 1.18.5.1, Copyright 2004-2007 Linden Research, Inc."; diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist index ec08e21..2c9f58a 100644 --- a/linden/indra/newview/Info-SecondLife.plist +++ b/linden/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.18.5.0 + 1.18.5.1 CSResourcesFileMapped diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp index 8cbe22c..929dfe4 100644 --- a/linden/indra/newview/llcontroldef.cpp +++ b/linden/indra/newview/llcontroldef.cpp @@ -1377,13 +1377,15 @@ void declare_settings() gSavedSettings.declareBOOL("MapShowClassifieds", TRUE, "Show locations associated with classified ads on world map"); // Search panel in directory uses this URL for queries - // Trailing "/" matters. - gSavedSettings.declareString("SearchDefaultURL", - "http://secondlife.com/app/search/index.php?m=[MATURE]", + gSavedSettings.declareString("SearchURLDefault", + "http://secondlife.com/app/search/index.php?", "URL to load for empty searches"); - gSavedSettings.declareString("SearchQueryURL", - "http://secondlife.com/app/search/search_proxy.php?q=[QUERY]&s=[COLLECTION]&m=[MATURE]&t=[TEEN]®ion=[REGION]&x=[X]&y=[Y]&z=[Z]", + gSavedSettings.declareString("SearchURLQuery", + "http://secondlife.com/app/search/search_proxy.php?q=[QUERY]&s=[COLLECTION]&", "URL to use for searches"); + gSavedSettings.declareString("SearchURLSuffix", + "m=[MATURE]&t=[TEEN]®ion=[REGION]&x=[X]&y=[Y]&z=[Z]", + "Parameters added to end of search queries"); // Arrow keys move avatar while in chat? gSavedSettings.declareBOOL("ArrowKeysMoveAvatar", TRUE, "While cursor is in chat entry box, arrow keys still control your avatar"); diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp index 3b7142e..f386f5b 100644 --- a/linden/indra/newview/llfloaterdirectory.cpp +++ b/linden/indra/newview/llfloaterdirectory.cpp @@ -67,7 +67,8 @@ LLFloaterDirectory* LLFloaterDirectory::sInstance = NULL; LLFloaterDirectory::LLFloaterDirectory(const std::string& name) -: LLFloater(name, "FloaterFindRect2", "") +: LLFloater(name, "FloaterFindRect2", ""), + mMinimizing(false) { sInstance = this; @@ -470,16 +471,32 @@ void LLFloaterDirectory::setVisible(BOOL visible) } // virtual +void LLFloaterDirectory::setMinimized(BOOL b) +{ + mMinimizing = true; + LLFloater::setMinimized(b); + mMinimizing = false; +} + +// virtual void LLFloaterDirectory::reshape(S32 width, S32 height, BOOL called_from_parent) { - // Don't let this floater go below its minimum width and height, ever. - if (width < getMinWidth()) - { - width = getMinWidth(); - } - if (height < getMinHeight()) + // HACK: If the window (screen window) is made too small, the search floater + // will get resized below its minimum size, resulting in buttons hanging off + // the edge. So we need to limit reshape size. + // BUT: Minimizing the window is considered a resize. + // Remove this code when DEV-5670 is fixed ("Sanitize floater sizing behavior + // when SL window is made very small"). JC + if (!mMinimizing) { - height = getMinHeight(); + if (width < getMinWidth()) + { + width = getMinWidth(); + } + if (height < getMinHeight()) + { + height = getMinHeight(); + } } LLFloater::reshape(width, height, called_from_parent); } diff --git a/linden/indra/newview/llfloaterdirectory.h b/linden/indra/newview/llfloaterdirectory.h index f7a2905..d973f86 100644 --- a/linden/indra/newview/llfloaterdirectory.h +++ b/linden/indra/newview/llfloaterdirectory.h @@ -62,6 +62,7 @@ public: /*virtual*/ ~LLFloaterDirectory(); /*virtual*/ void setVisible(BOOL visible); + /*virtual*/ void setMinimized(BOOL minimize); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent); // Used for toggling God mode, which changes to visibility of @@ -129,6 +130,8 @@ public: LLPanelPlace* mPanelPlaceSmallp; LLPanelClassified* mPanelClassifiedp; +private: + bool mMinimizing; // HACK: see reshape() for details static LLFloaterDirectory *sInstance; }; diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp index 92224b8..cd22343 100644 --- a/linden/indra/newview/llnotify.cpp +++ b/linden/indra/newview/llnotify.cpp @@ -98,7 +98,7 @@ LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::for } else { - LLNotifyBox* notify = new LLNotifyBox(xml_template, args, callback, user_data, is_caution); + notify = new LLNotifyBox(xml_template, args, callback, user_data, is_caution); gNotifyBoxView->addChildAtEnd(notify); notify->moveToBack(); } @@ -744,6 +744,7 @@ void LLNotifyBox::onClickButton(void* data) if (self->mBehavior->mCallback) { self->mBehavior->mCallback(button, self->mBehavior->mData); + self->mBehavior->mCallback = NULL; // Notification callbacks only expect to be called once ever } self->close(); diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp index 50bdc9e..24db19f 100644 --- a/linden/indra/newview/llpaneldirfind.cpp +++ b/linden/indra/newview/llpaneldirfind.cpp @@ -88,11 +88,14 @@ private: static void onClickHome( void* data ); static void onClickSearch( void* data ); static void onCommitSearch(LLUICtrl*, void* data); - static void onKeystrokeSearchEditor(LLLineEditor* line, void* data); + + static std::string getSearchURLSuffix(bool mature); /*virtual*/ void onNavigateBegin( const EventType& eventIn ); /*virtual*/ void onNavigateComplete( const EventType& eventIn ); // Used to update progress indicator + /*virtual*/ void onLocationChange( const EventType& eventIn ); + // Debugging info to console private: #if LL_LIBXUL_ENABLED @@ -123,13 +126,9 @@ BOOL LLPanelDirFindAll::postBuild() if (gAgent.isTeen()) { childSetVisible("mature_check", false); + childSetValue("mature_check", false); } - // we don't record the last search query (yet) so search text will be empty -> disable search - childDisable("search_btn"); - - childSetKeystrokeCallback("search_editor", onKeystrokeSearchEditor, this); - #if LL_LIBXUL_ENABLED mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this, "find_browser"); if (mWebBrowser) @@ -190,7 +189,14 @@ void LLPanelDirFindAll::search(const std::string& search_text) } } - std::string url = gSavedSettings.getString("SearchQueryURL"); + // If user types "%" into search, it builds a bogus URL. + // Try to work around that. It's not a security problem + // as far as I can tell -- we MySQL escape database queries + // on the server. Do this after "+" substitution because + // "+" is an allowed character. + query = LLURI::escape(query); + + std::string url = gSavedSettings.getString("SearchURLQuery"); std::string substring = "[QUERY]"; url.replace(url.find(substring), substring.length(), query); @@ -199,46 +205,9 @@ void LLPanelDirFindAll::search(const std::string& search_text) substring = "[COLLECTION]"; url.replace(url.find(substring), substring.length(), selected_collection); - // if the mature checkbox is unchecked, modify query to remove - // terms with given phrase from the result set - substring = "[MATURE]"; - if ( childGetValue( "mature_check" ).asBoolean() == false ) - { - url.replace(url.find(substring), substring.length(), "N"); - } - else - { - url.replace(url.find(substring), substring.length(), "Y"); - } - - substring = "[TEEN]"; - const char* teen = (gAgent.isTeen() ? "Y" : "N"); - url.replace(url.find(substring), substring.length(), teen); - - // Include region and x/y position, not for the GSA, but - // just to get logs on the web server for search_proxy.php - // showing where people were standing when they searched. - std::string region_name; - LLViewerRegion* region = gAgent.getRegion(); - if (region) - { - region_name = region->getName(); - } - // take care of spaces in names - region_name = LLURI::escape(region_name); - substring = "[REGION]"; - url.replace(url.find(substring), substring.length(), region_name); - - LLVector3 pos_region = gAgent.getPositionAgent(); - std::string x = llformat("%.0f", pos_region.mV[VX]); - substring = "[X]"; - url.replace(url.find(substring), substring.length(), x); - std::string y = llformat("%.0f", pos_region.mV[VY]); - substring = "[Y]"; - url.replace(url.find(substring), substring.length(), y); - std::string z = llformat("%.0f", pos_region.mV[VZ]); - substring = "[Z]"; - url.replace(url.find(substring), substring.length(), z); + // Add common parameters (mature, teen, location) + bool mature = childGetValue( "mature_check" ).asBoolean(); + url += getSearchURLSuffix(mature); llinfos << "url " << url << llendl; @@ -265,18 +234,11 @@ void LLPanelDirFindAll::focus() void LLPanelDirFindAll::navigateToDefaultPage() { - std::string start_url = gSavedSettings.getString("SearchDefaultURL"); + std::string start_url = gSavedSettings.getString("SearchURLDefault"); + bool mature = childGetValue( "mature_check" ).asBoolean(); + start_url += getSearchURLSuffix( mature ); - std::string substring = "[MATURE]"; - if ( childGetValue( "mature_check" ).asBoolean() == false ) - { - start_url.replace( start_url.find( substring ), substring.length(), "N" ); - } - else - { - start_url.replace( start_url.find( substring ), substring.length(), "Y" ); - } - llinfos << "SEARCH> browsing to default url: " << start_url << llendl; + llinfos << "default url: " << start_url << llendl; #if LL_LIBXUL_ENABLED if (mWebBrowser) @@ -286,20 +248,60 @@ void LLPanelDirFindAll::navigateToDefaultPage() #endif //LL_LIBXUL_ENABLED } -// static - only enable search if there is at least 1 character -void LLPanelDirFindAll::onKeystrokeSearchEditor(LLLineEditor* line, void* data) +// static +std::string LLPanelDirFindAll::getSearchURLSuffix(bool mature_in) { - LLPanelDirBrowser *self = (LLPanelDirBrowser*)data; - if (line->getLength() > 0 ) + bool mature = mature_in; + // Teens never get mature results. Explicitly override because + // Lindens/testers have multiple accounts and shared settings sometimes + // result in teen=Y and mature=Y simultaneously. JC + if (gAgent.isTeen()) { - self->childEnable("search_btn"); + mature = false; } - else + + std::string url = gSavedSettings.getString("SearchURLSuffix"); + + // if the mature checkbox is unchecked, modify query to remove + // terms with given phrase from the result set + std::string substring = "[MATURE]"; + const char* mature_flag = (mature ? "Y" : "N"); + url.replace(url.find(substring), substring.length(), mature_flag); + + substring = "[TEEN]"; + const char* teen_flag = (gAgent.isTeen() ? "Y" : "N"); + url.replace(url.find(substring), substring.length(), teen_flag); + + // Include region and x/y position, not for the GSA, but + // just to get logs on the web server for search_proxy.php + // showing where people were standing when they searched. + std::string region_name; + LLViewerRegion* region = gAgent.getRegion(); + if (region) { - self->childDisable("search_btn"); + region_name = region->getName(); } + // take care of spaces in names + region_name = LLURI::escape(region_name); + substring = "[REGION]"; + url.replace(url.find(substring), substring.length(), region_name); + + LLVector3 pos_region = gAgent.getPositionAgent(); + + std::string x = llformat("%.0f", pos_region.mV[VX]); + substring = "[X]"; + url.replace(url.find(substring), substring.length(), x); + std::string y = llformat("%.0f", pos_region.mV[VY]); + substring = "[Y]"; + url.replace(url.find(substring), substring.length(), y); + std::string z = llformat("%.0f", pos_region.mV[VZ]); + substring = "[Z]"; + url.replace(url.find(substring), substring.length(), z); + + return url; } + // static void LLPanelDirFindAll::onClickBack( void* data ) { @@ -360,6 +362,11 @@ void LLPanelDirFindAll::onNavigateComplete( const EventType& eventIn ) childSetText("status_text", childGetText("done_text")); } +void LLPanelDirFindAll::onLocationChange( const EventType& eventIn ) +{ + llinfos << eventIn.getStringValue() << llendl; +} + //--------------------------------------------------------------------------- // LLPanelDirFindAllInterface //--------------------------------------------------------------------------- diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp index 923f4b3..7beba92 100644 --- a/linden/indra/newview/llpanelpermissions.cpp +++ b/linden/indra/newview/llpanelpermissions.cpp @@ -741,17 +741,17 @@ void LLPanelPermissions::refresh() } } - if (is_for_sale) + childSetValue("checkbox for sale", is_for_sale); + + // HACK: There are some old objects in world that are set for sale, + // but are no-transfer. We need to let users turn for-sale off, but only + // if for-sale is set. + bool cannot_actually_sell = !can_transfer || (!can_copy && sale_type == LLSaleInfo::FS_COPY); + if (is_for_sale && has_change_sale_ability && cannot_actually_sell) { - childSetValue("checkbox for sale",TRUE); - childSetTentative("checkbox for sale",!can_transfer || (!can_copy && sale_type == LLSaleInfo::FS_COPY)); + childSetEnabled("checkbox for sale", true); } - else - { - childSetValue("checkbox for sale",FALSE); - childSetTentative("checkbox for sale",false); - } - + // Check search status of objects BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ); bool include_in_search; diff --git a/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp index 880822a..ad2ef62 100644 --- a/linden/indra/newview/llurldispatcher.cpp +++ b/linden/indra/newview/llurldispatcher.cpp @@ -113,7 +113,7 @@ bool LLURLDispatcherImpl::isSLURL(const std::string& url) bool LLURLDispatcherImpl::isSLURLCommand(const std::string& url) { if (matchPrefix(url, SLURL_SL_PREFIX + SLURL_APP_TOKEN) - || matchPrefix(url, SLURL_SECONDLIFE_PREFIX + SLURL_APP_TOKEN) + || matchPrefix(url, SLURL_SECONDLIFE_PREFIX + "/" + SLURL_APP_TOKEN) || matchPrefix(url, SLURL_SLURL_PREFIX + SLURL_APP_TOKEN) ) { return true; diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 45006c1..8faa72c 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -5555,7 +5555,7 @@ class LLShowAgentProfile : public view_listener_t LLVOAvatar* avatar = find_avatar_from_object(agent_id); if (avatar) { - LLFloaterAvatarInfo::show(agent_id); + LLFloaterAvatarInfo::show( avatar->getID() ); } return true; } diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj index 549eb11..d1c572f 100644 --- a/linden/indra/newview/macview.xcodeproj/project.pbxproj +++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj @@ -727,7 +727,7 @@ "$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.cpp", "$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.h", ); - script = "mkdir -p \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}\"\n/usr/bin/yacc -d -o \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.cpp\" \"${INPUT_FILE_PATH}\""; + script = "mkdir -p \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}\"\n/usr/bin/yacc -d -o \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.cpp\" \"${INPUT_FILE_PATH}\"\n\nif [ -f \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.hpp\" ];\nthen\n\tmv \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.hpp\" \"${DERIVED_FILES_DIR}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.y.h\" ;\nfi\n"; }; 99AB96D808833FCD00AA3C8C /* PBXBuildRule */ = { isa = PBXBuildRule; @@ -909,6 +909,7 @@ 1A9897E80B98E2F4005C45D7 /* llbase32.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbase32.cpp; sourceTree = ""; }; 1A9EC236083EA0100023D510 /* llfloatereditui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatereditui.cpp; sourceTree = ""; }; 1A9EC23A083EA01F0023D510 /* llfloatereditui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatereditui.h; sourceTree = ""; }; + 1AB0DADC0A52E8A0001CACEB /* message_template.msg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = message_template.msg; path = ../../scripts/messages/message_template.msg; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; }; 1AA2EE9C0CBBE2790017E185 /* llfloaterlandmark.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterlandmark.h; sourceTree = ""; }; 1AA2EE9D0CBBE2790017E185 /* llfloaterlandmark.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterlandmark.cpp; sourceTree = ""; }; 1AA2EE9F0CBBE28C0017E185 /* llclassifiedstatsresponder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclassifiedstatsresponder.h; sourceTree = ""; }; @@ -917,7 +918,6 @@ 1AA2EEA30CBBE2BF0017E185 /* llfloaterurldisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterurldisplay.cpp; sourceTree = ""; }; 1AA2EEA50CBBE2D40017E185 /* llremoteparcelrequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llremoteparcelrequest.h; sourceTree = ""; }; 1AA2EEA60CBBE2D40017E185 /* llremoteparcelrequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llremoteparcelrequest.cpp; sourceTree = ""; }; - 1AB0DADC0A52E8A0001CACEB /* message_template.msg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = message_template.msg; path = ../../scripts/messages/message_template.msg; sourceTree = SOURCE_ROOT; }; 1AD3940C0CAB0003004BA76A /* llurlsimstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlsimstring.h; sourceTree = ""; }; 1AD3940D0CAB0003004BA76A /* llurldispatcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurldispatcher.h; sourceTree = ""; }; 1AD3940E0CAB000F004BA76A /* llurlsimstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlsimstring.cpp; sourceTree = ""; }; @@ -4990,10 +4990,13 @@ 9919347E09786FF300BF6EE0 /* Universal */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = macutil_Prefix.h; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "AutoUpdater-Info.plist"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ""; PRODUCT_NAME = AutoUpdater; }; name = Universal; @@ -5001,8 +5004,10 @@ 9919348009786FF300BF6EE0 /* Universal */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = macutil_Prefix.h; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "crashreporter-Info.plist"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = crashreporter; @@ -5098,6 +5103,7 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = NO; EXECUTABLE_PREFIX = lib; EXPORTED_SYMBOLS_FILE = ""; GCC_DYNAMIC_NO_PIC = NO; @@ -5111,6 +5117,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; PREBINDING = NO; PRELINK_LIBS = ""; + PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; PRODUCT_NAME = fmodwrapper; UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp; ZERO_LINK = NO; @@ -5121,6 +5128,7 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = NO; EXECUTABLE_PREFIX = lib; EXPORTED_SYMBOLS_FILE = ""; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -5132,6 +5140,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; PREBINDING = NO; PRELINK_LIBS = ""; + PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; PRODUCT_NAME = fmodwrapper; UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp; ZERO_LINK = NO; @@ -5141,6 +5150,7 @@ 9967E90D0B37536D0087BD1B /* Universal */ = { isa = XCBuildConfiguration; buildSettings = { + DEAD_CODE_STRIPPING = NO; EXECUTABLE_PREFIX = lib; EXPORTED_SYMBOLS_FILE = ""; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -5152,6 +5162,7 @@ OTHER_LDFLAGS = ""; PREBINDING = NO; PRELINK_LIBS = ""; + PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; PRODUCT_NAME = fmodwrapper; UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp; ZERO_LINK = NO; @@ -5177,8 +5188,10 @@ 999484450883114200EFC621 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = macutil_Prefix.h; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "crashreporter-Info.plist"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = crashreporter; @@ -5188,8 +5201,10 @@ 999484460883114200EFC621 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = macutil_Prefix.h; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "crashreporter-Info.plist"; LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = crashreporter; @@ -5199,10 +5214,13 @@ 9994844A0883114200EFC621 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = macutil_Prefix.h; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "AutoUpdater-Info.plist"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ""; PRODUCT_NAME = AutoUpdater; }; name = Development; @@ -5210,10 +5228,13 @@ 9994844B0883114200EFC621 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = macutil_Prefix.h; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "AutoUpdater-Info.plist"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ""; PRODUCT_NAME = AutoUpdater; }; name = Deployment; @@ -5234,7 +5255,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\""; - OTHER_LDFLAGS = "-weak-lllmozlib"; + OTHER_LDFLAGS = ( + "-weak-lllmozlib", + "-Wl,-search_paths_first", + ); PRODUCT_NAME = "Second Life"; SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders"; WARNING_CFLAGS = ( @@ -5264,7 +5288,10 @@ ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\""; LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\""; - OTHER_LDFLAGS = "-lllmozlib"; + OTHER_LDFLAGS = ( + "-lllmozlib", + "-Wl,-search_paths_first", + ); PRODUCT_NAME = "Second Life"; SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders"; WRAPPER_EXTENSION = app; @@ -5395,10 +5422,12 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = "@executable_path/../Resources/"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = "-Wl,-search_paths_first"; PREBINDING = NO; PRODUCT_NAME = llkdu; ZERO_LINK = YES; @@ -5412,11 +5441,13 @@ EXECUTABLE_PREFIX = lib; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = G5; INSTALL_PATH = "@executable_path/../Resources/"; LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment\""; LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\""; + OTHER_LDFLAGS = "-Wl,-search_paths_first"; PREBINDING = NO; PRODUCT_NAME = llkdu; ZERO_LINK = NO; @@ -5428,11 +5459,13 @@ buildSettings = { EXECUTABLE_PREFIX = lib; GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_MODEL_TUNING = G5; INSTALL_PATH = "@executable_path/../Resources/"; LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment"; LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\""; + OTHER_LDFLAGS = "-Wl,-search_paths_first"; PREBINDING = NO; PRODUCT_NAME = llkdu; ZERO_LINK = YES; diff --git a/linden/indra/newview/postbuild.bat b/linden/indra/newview/postbuild.bat index 0eabb87..106dde1 100644 --- a/linden/indra/newview/postbuild.bat +++ b/linden/indra/newview/postbuild.bat @@ -10,34 +10,34 @@ goto end :debug echo copying debug files -copy ..\..\libraries\i686-win32\lib_debug\freebl3.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\gksvggdiplus.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\js3250.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\nspr4.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\nss3.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\nssckbi.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\plc4.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\plds4.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\smime3.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\softokn3.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\ssl3.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\xpcom.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\xul.dll .\debug\ /y -copy ..\..\libraries\i686-win32\lib_debug\openjpeg.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\freebl3.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\gksvggdiplus.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\js3250.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\nspr4.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\nss3.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\nssckbi.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\plc4.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\plds4.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\smime3.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\softokn3.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\ssl3.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\xpcom.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\xul.dll .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\openjpeg.dll .\debug\ /y rem --- this is required for mozilla debug builds and displays the aborty/retry/ignore dialog on an assert - crashes without it --- -copy ..\..\libraries\i686-win32\lib_debug\windbgdlg.exe .\debug\ /y +xcopy ..\..\libraries\i686-win32\lib_debug\windbgdlg.exe .\debug\ /y rem --- runtime pieces for the bHear stuff. -copy .\vivox-runtime\i686-win32\tntk.dll .\ /y -copy .\vivox-runtime\i686-win32\libeay32.dll .\ /y -copy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y -copy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y -copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y -copy .\vivox-runtime\i686-win32\srtp.dll .\ /y -copy .\vivox-runtime\i686-win32\alut.dll .\ /y -copy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y -copy .\vivox-runtime\i686-win32\ortp.dll .\ /y -copy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y +xcopy .\vivox-runtime\i686-win32\tntk.dll .\ /y +xcopy .\vivox-runtime\i686-win32\libeay32.dll .\ /y +xcopy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y +xcopy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y +xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y +xcopy .\vivox-runtime\i686-win32\srtp.dll .\ /y +xcopy .\vivox-runtime\i686-win32\alut.dll .\ /y +xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y +xcopy .\vivox-runtime\i686-win32\ortp.dll .\ /y +xcopy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y @IF NOT EXIST ..\llkdu\Debug\llkdu.dll ( @IF EXIST ..\..\libraries\i686-win32\lib_debug\llkdu.dll ( @@ -53,108 +53,108 @@ goto end :release echo copying release files -copy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\js3250.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\nss3.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\plc4.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\plds4.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\smime3.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\xul.dll .\Release\ /y -copy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\xul.dll .\Release\ /y +xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\Release\ /y rem --- runtime pieces for the bHear stuff. -copy .\vivox-runtime\i686-win32\tntk.dll .\ /y -copy .\vivox-runtime\i686-win32\libeay32.dll .\ /y -copy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y -copy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y -copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y -copy .\vivox-runtime\i686-win32\srtp.dll .\ /y -copy .\vivox-runtime\i686-win32\alut.dll .\ /y -copy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y -copy .\vivox-runtime\i686-win32\ortp.dll .\ /y -copy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y +xcopy .\vivox-runtime\i686-win32\tntk.dll .\ /y +xcopy .\vivox-runtime\i686-win32\libeay32.dll .\ /y +xcopy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y +xcopy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y +xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y +xcopy .\vivox-runtime\i686-win32\srtp.dll .\ /y +xcopy .\vivox-runtime\i686-win32\alut.dll .\ /y +xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y +xcopy .\vivox-runtime\i686-win32\ortp.dll .\ /y +xcopy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y @IF NOT EXIST ..\llkdu\Release\llkdu.dll ( - copy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\Release\ /y + xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\Release\ /y ) ELSE ( - copy ..\llkdu\Release\llkdu.dll .\Release\ /y + xcopy ..\llkdu\Release\llkdu.dll .\Release\ /y ) goto end :releasenoopt echo copying releasenoopt files -copy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseNoOpt\ /y -copy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseNoOpt\ /y +xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseNoOpt\ /y rem --- runtime pieces for the bHear stuff. -copy .\vivox-runtime\i686-win32\tntk.dll . /y -copy .\vivox-runtime\i686-win32\libeay32.dll . /y -copy .\vivox-runtime\i686-win32\SLVoice.exe . /y -copy .\vivox-runtime\i686-win32\ssleay32.dll . /y -copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe . /y -copy .\vivox-runtime\i686-win32\srtp.dll . /y -copy .\vivox-runtime\i686-win32\alut.dll . /y -copy .\vivox-runtime\i686-win32\vivoxsdk.dll . /y -copy .\vivox-runtime\i686-win32\ortp.dll . /y -copy .\vivox-runtime\i686-win32\wrap_oal.dll . /y +xcopy .\vivox-runtime\i686-win32\tntk.dll . /y +xcopy .\vivox-runtime\i686-win32\libeay32.dll . /y +xcopy .\vivox-runtime\i686-win32\SLVoice.exe . /y +xcopy .\vivox-runtime\i686-win32\ssleay32.dll . /y +xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe . /y +xcopy .\vivox-runtime\i686-win32\srtp.dll . /y +xcopy .\vivox-runtime\i686-win32\alut.dll . /y +xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll . /y +xcopy .\vivox-runtime\i686-win32\ortp.dll . /y +xcopy .\vivox-runtime\i686-win32\wrap_oal.dll . /y @IF NOT EXIST ..\llkdu\ReleaseNoOpt\llkdu.dll ( - copy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseNoOpt\ /y + xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseNoOpt\ /y ) ELSE ( - copy ..\llkdu\ReleaseNoOpt\llkdu.dll .\ReleaseNoOpt\ /y + xcopy ..\llkdu\ReleaseNoOpt\llkdu.dll .\ReleaseNoOpt\ /y ) goto end :releasefordownload echo copying releasefordownload files -copy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseForDownload\ /y -copy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseForDownload\ /y +xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseForDownload\ /y rem --- runtime pieces for the bHear stuff. -copy .\vivox-runtime\i686-win32\tntk.dll .\ /y -copy .\vivox-runtime\i686-win32\libeay32.dll .\ /y -copy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y -copy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y -copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y -copy .\vivox-runtime\i686-win32\srtp.dll .\ /y -copy .\vivox-runtime\i686-win32\alut.dll .\ /y -copy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y -copy .\vivox-runtime\i686-win32\ortp.dll .\ /y -copy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y +xcopy .\vivox-runtime\i686-win32\tntk.dll .\ /y +xcopy .\vivox-runtime\i686-win32\libeay32.dll .\ /y +xcopy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y +xcopy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y +xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y +xcopy .\vivox-runtime\i686-win32\srtp.dll .\ /y +xcopy .\vivox-runtime\i686-win32\alut.dll .\ /y +xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y +xcopy .\vivox-runtime\i686-win32\ortp.dll .\ /y +xcopy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y @IF NOT EXIST ..\llkdu\Release\llkdu.dll ( - copy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseForDownload\ /y + xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseForDownload\ /y ) ELSE ( - copy ..\llkdu\Release\llkdu.dll .\ReleaseForDownload\ /y + xcopy ..\llkdu\Release\llkdu.dll .\ReleaseForDownload\ /y ) goto end diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt index 6d8fdd1..9817d7f 100644 --- a/linden/indra/newview/releasenotes.txt +++ b/linden/indra/newview/releasenotes.txt @@ -1,3 +1,14 @@ +Release Notes for Second Life 1.18.5(1) November 16, 2007 +===================================== +Changes: +* Search button always enabled in Search All panel +** Empty searches show the classifieds splash page +* Teleport is the first option listed for landmarks in inventory + +Bug fixes: +* Fixed search turning transparent instead of minimizing +* Fixed VWR-3073: Right-clicking someone's attachments to view profile loads (???) (???) instead + Release Notes for Second Life 1.18.5(0) November 13, 2007 ===================================== New features: diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc index 2d5def4..7f45e83 100644 --- a/linden/indra/newview/res/newViewRes.rc +++ b/linden/indra/newview/res/newViewRes.rc @@ -228,8 +228,8 @@ TOOLPIPETTE CURSOR "toolpipette.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,18,5,0 - PRODUCTVERSION 1,18,5,0 + FILEVERSION 1,18,5,1 + PRODUCTVERSION 1,18,5,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -246,12 +246,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "1.18.5.0" + VALUE "FileVersion", "1.18.5.1" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "1.18.5.0" + VALUE "ProductVersion", "1.18.5.1" END END BLOCK "VarFileInfo" diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml index c13b81e..3dfe14a 100644 --- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml +++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml @@ -109,7 +109,7 @@ - diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp index 747d4e0..3b24371 100644 --- a/linden/indra/newview/viewer.cpp +++ b/linden/indra/newview/viewer.cpp @@ -1330,7 +1330,7 @@ int main( int argc, char **argv ) #endif // LL_WINDOWS // Build a string representing the current version number. - gCurrentVersion = llformat("%s %d.%d.%d.%d", LL_CHANNEL, LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD ); + gCurrentVersion = llformat("%s %d.%d.%d.%d", gChannelName.c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD ); // // Various introspection concerning the libs we're using -- cgit v1.1