aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/llcommon/llpreprocessor.h2
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
-rw-r--r--linden/indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--linden/indra/newview/Info-SecondLife.plist2
-rw-r--r--linden/indra/newview/llcontroldef.cpp12
-rw-r--r--linden/indra/newview/llfloaterdirectory.cpp33
-rw-r--r--linden/indra/newview/llfloaterdirectory.h3
-rw-r--r--linden/indra/newview/llnotify.cpp3
-rw-r--r--linden/indra/newview/llpaneldirfind.cpp137
-rw-r--r--linden/indra/newview/llpanelpermissions.cpp18
-rw-r--r--linden/indra/newview/llurldispatcher.cpp2
-rw-r--r--linden/indra/newview/llviewermenu.cpp2
-rw-r--r--linden/indra/newview/macview.xcodeproj/project.pbxproj41
-rw-r--r--linden/indra/newview/postbuild.bat206
-rw-r--r--linden/indra/newview/releasenotes.txt11
-rw-r--r--linden/indra/newview/res/newViewRes.rc8
-rw-r--r--linden/indra/newview/skins/xui/en-us/menu_inventory.xml2
-rw-r--r--linden/indra/newview/viewer.cpp2
18 files changed, 282 insertions, 208 deletions
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 @@
125#define BOOST_REGEX_NO_LIB 1 125#define BOOST_REGEX_NO_LIB 1
126#define CURL_STATICLIB 1 126#define CURL_STATICLIB 1
127 127
128#define LL_LCD_COMPILE 1 128//#define LL_LCD_COMPILE 0
129 129
130#endif // LL_WINDOWS 130#endif // LL_WINDOWS
131 131
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 @@
35const S32 LL_VERSION_MAJOR = 1; 35const S32 LL_VERSION_MAJOR = 1;
36const S32 LL_VERSION_MINOR = 18; 36const S32 LL_VERSION_MINOR = 18;
37const S32 LL_VERSION_PATCH = 5; 37const S32 LL_VERSION_PATCH = 5;
38const S32 LL_VERSION_BUILD = 0; 38const S32 LL_VERSION_BUILD = 1;
39 39
40const char * const LL_CHANNEL = "Second Life Release"; 40const char * const LL_CHANNEL = "Second Life Release";
41 41
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 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Second Life"; 3CFBundleName = "Second Life";
4CFBundleShortVersionString = "Second Life version 1.18.5.0"; 4CFBundleShortVersionString = "Second Life version 1.18.5.1";
5CFBundleGetInfoString = "Second Life version 1.18.5.0, Copyright 2004-2007 Linden Research, Inc."; 5CFBundleGetInfoString = "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 @@
32 </dict> 32 </dict>
33 </array> 33 </array>
34 <key>CFBundleVersion</key> 34 <key>CFBundleVersion</key>
35 <string>1.18.5.0</string> 35 <string>1.18.5.1</string>
36 <key>CSResourcesFileMapped</key> 36 <key>CSResourcesFileMapped</key>
37 <true/> 37 <true/>
38</dict> 38</dict>
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()
1377 gSavedSettings.declareBOOL("MapShowClassifieds", TRUE, "Show locations associated with classified ads on world map"); 1377 gSavedSettings.declareBOOL("MapShowClassifieds", TRUE, "Show locations associated with classified ads on world map");
1378 1378
1379 // Search panel in directory uses this URL for queries 1379 // Search panel in directory uses this URL for queries
1380 // Trailing "/" matters. 1380 gSavedSettings.declareString("SearchURLDefault",
1381 gSavedSettings.declareString("SearchDefaultURL", 1381 "http://secondlife.com/app/search/index.php?",
1382 "http://secondlife.com/app/search/index.php?m=[MATURE]",
1383 "URL to load for empty searches"); 1382 "URL to load for empty searches");
1384 gSavedSettings.declareString("SearchQueryURL", 1383 gSavedSettings.declareString("SearchURLQuery",
1385 "http://secondlife.com/app/search/search_proxy.php?q=[QUERY]&s=[COLLECTION]&m=[MATURE]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]", 1384 "http://secondlife.com/app/search/search_proxy.php?q=[QUERY]&s=[COLLECTION]&",
1386 "URL to use for searches"); 1385 "URL to use for searches");
1386 gSavedSettings.declareString("SearchURLSuffix",
1387 "m=[MATURE]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]",
1388 "Parameters added to end of search queries");
1387 1389
1388 // Arrow keys move avatar while in chat? 1390 // Arrow keys move avatar while in chat?
1389 gSavedSettings.declareBOOL("ArrowKeysMoveAvatar", TRUE, "While cursor is in chat entry box, arrow keys still control your avatar"); 1391 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 @@
67LLFloaterDirectory* LLFloaterDirectory::sInstance = NULL; 67LLFloaterDirectory* LLFloaterDirectory::sInstance = NULL;
68 68
69LLFloaterDirectory::LLFloaterDirectory(const std::string& name) 69LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
70: LLFloater(name, "FloaterFindRect2", "") 70: LLFloater(name, "FloaterFindRect2", ""),
71 mMinimizing(false)
71{ 72{
72 sInstance = this; 73 sInstance = this;
73 74
@@ -470,16 +471,32 @@ void LLFloaterDirectory::setVisible(BOOL visible)
470} 471}
471 472
472// virtual 473// virtual
474void LLFloaterDirectory::setMinimized(BOOL b)
475{
476 mMinimizing = true;
477 LLFloater::setMinimized(b);
478 mMinimizing = false;
479}
480
481// virtual
473void LLFloaterDirectory::reshape(S32 width, S32 height, BOOL called_from_parent) 482void LLFloaterDirectory::reshape(S32 width, S32 height, BOOL called_from_parent)
474{ 483{
475 // Don't let this floater go below its minimum width and height, ever. 484 // HACK: If the window (screen window) is made too small, the search floater
476 if (width < getMinWidth()) 485 // will get resized below its minimum size, resulting in buttons hanging off
477 { 486 // the edge. So we need to limit reshape size.
478 width = getMinWidth(); 487 // BUT: Minimizing the window is considered a resize.
479 } 488 // Remove this code when DEV-5670 is fixed ("Sanitize floater sizing behavior
480 if (height < getMinHeight()) 489 // when SL window is made very small"). JC
490 if (!mMinimizing)
481 { 491 {
482 height = getMinHeight(); 492 if (width < getMinWidth())
493 {
494 width = getMinWidth();
495 }
496 if (height < getMinHeight())
497 {
498 height = getMinHeight();
499 }
483 } 500 }
484 LLFloater::reshape(width, height, called_from_parent); 501 LLFloater::reshape(width, height, called_from_parent);
485} 502}
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:
62 /*virtual*/ ~LLFloaterDirectory(); 62 /*virtual*/ ~LLFloaterDirectory();
63 63
64 /*virtual*/ void setVisible(BOOL visible); 64 /*virtual*/ void setVisible(BOOL visible);
65 /*virtual*/ void setMinimized(BOOL minimize);
65 /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent); 66 /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
66 67
67 // Used for toggling God mode, which changes to visibility of 68 // Used for toggling God mode, which changes to visibility of
@@ -129,6 +130,8 @@ public:
129 LLPanelPlace* mPanelPlaceSmallp; 130 LLPanelPlace* mPanelPlaceSmallp;
130 LLPanelClassified* mPanelClassifiedp; 131 LLPanelClassified* mPanelClassifiedp;
131 132
133private:
134 bool mMinimizing; // HACK: see reshape() for details
132 static LLFloaterDirectory *sInstance; 135 static LLFloaterDirectory *sInstance;
133}; 136};
134 137
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
98 } 98 }
99 else 99 else
100 { 100 {
101 LLNotifyBox* notify = new LLNotifyBox(xml_template, args, callback, user_data, is_caution); 101 notify = new LLNotifyBox(xml_template, args, callback, user_data, is_caution);
102 gNotifyBoxView->addChildAtEnd(notify); 102 gNotifyBoxView->addChildAtEnd(notify);
103 notify->moveToBack(); 103 notify->moveToBack();
104 } 104 }
@@ -744,6 +744,7 @@ void LLNotifyBox::onClickButton(void* data)
744 if (self->mBehavior->mCallback) 744 if (self->mBehavior->mCallback)
745 { 745 {
746 self->mBehavior->mCallback(button, self->mBehavior->mData); 746 self->mBehavior->mCallback(button, self->mBehavior->mData);
747 self->mBehavior->mCallback = NULL; // Notification callbacks only expect to be called once ever
747 } 748 }
748 749
749 self->close(); 750 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:
88 static void onClickHome( void* data ); 88 static void onClickHome( void* data );
89 static void onClickSearch( void* data ); 89 static void onClickSearch( void* data );
90 static void onCommitSearch(LLUICtrl*, void* data); 90 static void onCommitSearch(LLUICtrl*, void* data);
91 static void onKeystrokeSearchEditor(LLLineEditor* line, void* data); 91
92 static std::string getSearchURLSuffix(bool mature);
92 93
93 /*virtual*/ void onNavigateBegin( const EventType& eventIn ); 94 /*virtual*/ void onNavigateBegin( const EventType& eventIn );
94 /*virtual*/ void onNavigateComplete( const EventType& eventIn ); 95 /*virtual*/ void onNavigateComplete( const EventType& eventIn );
95 // Used to update progress indicator 96 // Used to update progress indicator
97 /*virtual*/ void onLocationChange( const EventType& eventIn );
98 // Debugging info to console
96 99
97private: 100private:
98#if LL_LIBXUL_ENABLED 101#if LL_LIBXUL_ENABLED
@@ -123,13 +126,9 @@ BOOL LLPanelDirFindAll::postBuild()
123 if (gAgent.isTeen()) 126 if (gAgent.isTeen())
124 { 127 {
125 childSetVisible("mature_check", false); 128 childSetVisible("mature_check", false);
129 childSetValue("mature_check", false);
126 } 130 }
127 131
128 // we don't record the last search query (yet) so search text will be empty -> disable search
129 childDisable("search_btn");
130
131 childSetKeystrokeCallback("search_editor", onKeystrokeSearchEditor, this);
132
133#if LL_LIBXUL_ENABLED 132#if LL_LIBXUL_ENABLED
134 mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this, "find_browser"); 133 mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this, "find_browser");
135 if (mWebBrowser) 134 if (mWebBrowser)
@@ -190,7 +189,14 @@ void LLPanelDirFindAll::search(const std::string& search_text)
190 } 189 }
191 } 190 }
192 191
193 std::string url = gSavedSettings.getString("SearchQueryURL"); 192 // If user types "%" into search, it builds a bogus URL.
193 // Try to work around that. It's not a security problem
194 // as far as I can tell -- we MySQL escape database queries
195 // on the server. Do this after "+" substitution because
196 // "+" is an allowed character.
197 query = LLURI::escape(query);
198
199 std::string url = gSavedSettings.getString("SearchURLQuery");
194 std::string substring = "[QUERY]"; 200 std::string substring = "[QUERY]";
195 url.replace(url.find(substring), substring.length(), query); 201 url.replace(url.find(substring), substring.length(), query);
196 202
@@ -199,46 +205,9 @@ void LLPanelDirFindAll::search(const std::string& search_text)
199 substring = "[COLLECTION]"; 205 substring = "[COLLECTION]";
200 url.replace(url.find(substring), substring.length(), selected_collection); 206 url.replace(url.find(substring), substring.length(), selected_collection);
201 207
202 // if the mature checkbox is unchecked, modify query to remove 208 // Add common parameters (mature, teen, location)
203 // terms with given phrase from the result set 209 bool mature = childGetValue( "mature_check" ).asBoolean();
204 substring = "[MATURE]"; 210 url += getSearchURLSuffix(mature);
205 if ( childGetValue( "mature_check" ).asBoolean() == false )
206 {
207 url.replace(url.find(substring), substring.length(), "N");
208 }
209 else
210 {
211 url.replace(url.find(substring), substring.length(), "Y");
212 }
213
214 substring = "[TEEN]";
215 const char* teen = (gAgent.isTeen() ? "Y" : "N");
216 url.replace(url.find(substring), substring.length(), teen);
217
218 // Include region and x/y position, not for the GSA, but
219 // just to get logs on the web server for search_proxy.php
220 // showing where people were standing when they searched.
221 std::string region_name;
222 LLViewerRegion* region = gAgent.getRegion();
223 if (region)
224 {
225 region_name = region->getName();
226 }
227 // take care of spaces in names
228 region_name = LLURI::escape(region_name);
229 substring = "[REGION]";
230 url.replace(url.find(substring), substring.length(), region_name);
231
232 LLVector3 pos_region = gAgent.getPositionAgent();
233 std::string x = llformat("%.0f", pos_region.mV[VX]);
234 substring = "[X]";
235 url.replace(url.find(substring), substring.length(), x);
236 std::string y = llformat("%.0f", pos_region.mV[VY]);
237 substring = "[Y]";
238 url.replace(url.find(substring), substring.length(), y);
239 std::string z = llformat("%.0f", pos_region.mV[VZ]);
240 substring = "[Z]";
241 url.replace(url.find(substring), substring.length(), z);
242 211
243 llinfos << "url " << url << llendl; 212 llinfos << "url " << url << llendl;
244 213
@@ -265,18 +234,11 @@ void LLPanelDirFindAll::focus()
265 234
266void LLPanelDirFindAll::navigateToDefaultPage() 235void LLPanelDirFindAll::navigateToDefaultPage()
267{ 236{
268 std::string start_url = gSavedSettings.getString("SearchDefaultURL"); 237 std::string start_url = gSavedSettings.getString("SearchURLDefault");
238 bool mature = childGetValue( "mature_check" ).asBoolean();
239 start_url += getSearchURLSuffix( mature );
269 240
270 std::string substring = "[MATURE]"; 241 llinfos << "default url: " << start_url << llendl;
271 if ( childGetValue( "mature_check" ).asBoolean() == false )
272 {
273 start_url.replace( start_url.find( substring ), substring.length(), "N" );
274 }
275 else
276 {
277 start_url.replace( start_url.find( substring ), substring.length(), "Y" );
278 }
279 llinfos << "SEARCH> browsing to default url: " << start_url << llendl;
280 242
281#if LL_LIBXUL_ENABLED 243#if LL_LIBXUL_ENABLED
282 if (mWebBrowser) 244 if (mWebBrowser)
@@ -286,20 +248,60 @@ void LLPanelDirFindAll::navigateToDefaultPage()
286#endif //LL_LIBXUL_ENABLED 248#endif //LL_LIBXUL_ENABLED
287} 249}
288 250
289// static - only enable search if there is at least 1 character 251// static
290void LLPanelDirFindAll::onKeystrokeSearchEditor(LLLineEditor* line, void* data) 252std::string LLPanelDirFindAll::getSearchURLSuffix(bool mature_in)
291{ 253{
292 LLPanelDirBrowser *self = (LLPanelDirBrowser*)data; 254 bool mature = mature_in;
293 if (line->getLength() > 0 ) 255 // Teens never get mature results. Explicitly override because
256 // Lindens/testers have multiple accounts and shared settings sometimes
257 // result in teen=Y and mature=Y simultaneously. JC
258 if (gAgent.isTeen())
294 { 259 {
295 self->childEnable("search_btn"); 260 mature = false;
296 } 261 }
297 else 262
263 std::string url = gSavedSettings.getString("SearchURLSuffix");
264
265 // if the mature checkbox is unchecked, modify query to remove
266 // terms with given phrase from the result set
267 std::string substring = "[MATURE]";
268 const char* mature_flag = (mature ? "Y" : "N");
269 url.replace(url.find(substring), substring.length(), mature_flag);
270
271 substring = "[TEEN]";
272 const char* teen_flag = (gAgent.isTeen() ? "Y" : "N");
273 url.replace(url.find(substring), substring.length(), teen_flag);
274
275 // Include region and x/y position, not for the GSA, but
276 // just to get logs on the web server for search_proxy.php
277 // showing where people were standing when they searched.
278 std::string region_name;
279 LLViewerRegion* region = gAgent.getRegion();
280 if (region)
298 { 281 {
299 self->childDisable("search_btn"); 282 region_name = region->getName();
300 } 283 }
284 // take care of spaces in names
285 region_name = LLURI::escape(region_name);
286 substring = "[REGION]";
287 url.replace(url.find(substring), substring.length(), region_name);
288
289 LLVector3 pos_region = gAgent.getPositionAgent();
290
291 std::string x = llformat("%.0f", pos_region.mV[VX]);
292 substring = "[X]";
293 url.replace(url.find(substring), substring.length(), x);
294 std::string y = llformat("%.0f", pos_region.mV[VY]);
295 substring = "[Y]";
296 url.replace(url.find(substring), substring.length(), y);
297 std::string z = llformat("%.0f", pos_region.mV[VZ]);
298 substring = "[Z]";
299 url.replace(url.find(substring), substring.length(), z);
300
301 return url;
301} 302}
302 303
304
303// static 305// static
304void LLPanelDirFindAll::onClickBack( void* data ) 306void LLPanelDirFindAll::onClickBack( void* data )
305{ 307{
@@ -360,6 +362,11 @@ void LLPanelDirFindAll::onNavigateComplete( const EventType& eventIn )
360 childSetText("status_text", childGetText("done_text")); 362 childSetText("status_text", childGetText("done_text"));
361} 363}
362 364
365void LLPanelDirFindAll::onLocationChange( const EventType& eventIn )
366{
367 llinfos << eventIn.getStringValue() << llendl;
368}
369
363//--------------------------------------------------------------------------- 370//---------------------------------------------------------------------------
364// LLPanelDirFindAllInterface 371// LLPanelDirFindAllInterface
365//--------------------------------------------------------------------------- 372//---------------------------------------------------------------------------
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()
741 } 741 }
742 } 742 }
743 743
744 if (is_for_sale) 744 childSetValue("checkbox for sale", is_for_sale);
745
746 // HACK: There are some old objects in world that are set for sale,
747 // but are no-transfer. We need to let users turn for-sale off, but only
748 // if for-sale is set.
749 bool cannot_actually_sell = !can_transfer || (!can_copy && sale_type == LLSaleInfo::FS_COPY);
750 if (is_for_sale && has_change_sale_ability && cannot_actually_sell)
745 { 751 {
746 childSetValue("checkbox for sale",TRUE); 752 childSetEnabled("checkbox for sale", true);
747 childSetTentative("checkbox for sale",!can_transfer || (!can_copy && sale_type == LLSaleInfo::FS_COPY));
748 } 753 }
749 else 754
750 {
751 childSetValue("checkbox for sale",FALSE);
752 childSetTentative("checkbox for sale",false);
753 }
754
755 // Check search status of objects 755 // Check search status of objects
756 BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ); 756 BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
757 bool include_in_search; 757 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)
113bool LLURLDispatcherImpl::isSLURLCommand(const std::string& url) 113bool LLURLDispatcherImpl::isSLURLCommand(const std::string& url)
114{ 114{
115 if (matchPrefix(url, SLURL_SL_PREFIX + SLURL_APP_TOKEN) 115 if (matchPrefix(url, SLURL_SL_PREFIX + SLURL_APP_TOKEN)
116 || matchPrefix(url, SLURL_SECONDLIFE_PREFIX + SLURL_APP_TOKEN) 116 || matchPrefix(url, SLURL_SECONDLIFE_PREFIX + "/" + SLURL_APP_TOKEN)
117 || matchPrefix(url, SLURL_SLURL_PREFIX + SLURL_APP_TOKEN) ) 117 || matchPrefix(url, SLURL_SLURL_PREFIX + SLURL_APP_TOKEN) )
118 { 118 {
119 return true; 119 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
5555 LLVOAvatar* avatar = find_avatar_from_object(agent_id); 5555 LLVOAvatar* avatar = find_avatar_from_object(agent_id);
5556 if (avatar) 5556 if (avatar)
5557 { 5557 {
5558 LLFloaterAvatarInfo::show(agent_id); 5558 LLFloaterAvatarInfo::show( avatar->getID() );
5559 } 5559 }
5560 return true; 5560 return true;
5561 } 5561 }
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 @@
727 "$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.cpp", 727 "$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.cpp",
728 "$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.h", 728 "$(DERIVED_FILES_DIR)/${CURRENT_ARCH}/$(INPUT_FILE_BASE).y.h",
729 ); 729 );
730 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}\""; 730 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";
731 }; 731 };
732 99AB96D808833FCD00AA3C8C /* PBXBuildRule */ = { 732 99AB96D808833FCD00AA3C8C /* PBXBuildRule */ = {
733 isa = PBXBuildRule; 733 isa = PBXBuildRule;
@@ -909,6 +909,7 @@
909 1A9897E80B98E2F4005C45D7 /* llbase32.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbase32.cpp; sourceTree = "<group>"; }; 909 1A9897E80B98E2F4005C45D7 /* llbase32.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbase32.cpp; sourceTree = "<group>"; };
910 1A9EC236083EA0100023D510 /* llfloatereditui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatereditui.cpp; sourceTree = "<group>"; }; 910 1A9EC236083EA0100023D510 /* llfloatereditui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatereditui.cpp; sourceTree = "<group>"; };
911 1A9EC23A083EA01F0023D510 /* llfloatereditui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatereditui.h; sourceTree = "<group>"; }; 911 1A9EC23A083EA01F0023D510 /* llfloatereditui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatereditui.h; sourceTree = "<group>"; };
912 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; };
912 1AA2EE9C0CBBE2790017E185 /* llfloaterlandmark.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterlandmark.h; sourceTree = "<group>"; }; 913 1AA2EE9C0CBBE2790017E185 /* llfloaterlandmark.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterlandmark.h; sourceTree = "<group>"; };
913 1AA2EE9D0CBBE2790017E185 /* llfloaterlandmark.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterlandmark.cpp; sourceTree = "<group>"; }; 914 1AA2EE9D0CBBE2790017E185 /* llfloaterlandmark.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterlandmark.cpp; sourceTree = "<group>"; };
914 1AA2EE9F0CBBE28C0017E185 /* llclassifiedstatsresponder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclassifiedstatsresponder.h; sourceTree = "<group>"; }; 915 1AA2EE9F0CBBE28C0017E185 /* llclassifiedstatsresponder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclassifiedstatsresponder.h; sourceTree = "<group>"; };
@@ -917,7 +918,6 @@
917 1AA2EEA30CBBE2BF0017E185 /* llfloaterurldisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterurldisplay.cpp; sourceTree = "<group>"; }; 918 1AA2EEA30CBBE2BF0017E185 /* llfloaterurldisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterurldisplay.cpp; sourceTree = "<group>"; };
918 1AA2EEA50CBBE2D40017E185 /* llremoteparcelrequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llremoteparcelrequest.h; sourceTree = "<group>"; }; 919 1AA2EEA50CBBE2D40017E185 /* llremoteparcelrequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llremoteparcelrequest.h; sourceTree = "<group>"; };
919 1AA2EEA60CBBE2D40017E185 /* llremoteparcelrequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llremoteparcelrequest.cpp; sourceTree = "<group>"; }; 920 1AA2EEA60CBBE2D40017E185 /* llremoteparcelrequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llremoteparcelrequest.cpp; sourceTree = "<group>"; };
920 1AB0DADC0A52E8A0001CACEB /* message_template.msg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = message_template.msg; path = ../../scripts/messages/message_template.msg; sourceTree = SOURCE_ROOT; };
921 1AD3940C0CAB0003004BA76A /* llurlsimstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlsimstring.h; sourceTree = "<group>"; }; 921 1AD3940C0CAB0003004BA76A /* llurlsimstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurlsimstring.h; sourceTree = "<group>"; };
922 1AD3940D0CAB0003004BA76A /* llurldispatcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurldispatcher.h; sourceTree = "<group>"; }; 922 1AD3940D0CAB0003004BA76A /* llurldispatcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llurldispatcher.h; sourceTree = "<group>"; };
923 1AD3940E0CAB000F004BA76A /* llurlsimstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlsimstring.cpp; sourceTree = "<group>"; }; 923 1AD3940E0CAB000F004BA76A /* llurlsimstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurlsimstring.cpp; sourceTree = "<group>"; };
@@ -4990,10 +4990,13 @@
4990 9919347E09786FF300BF6EE0 /* Universal */ = { 4990 9919347E09786FF300BF6EE0 /* Universal */ = {
4991 isa = XCBuildConfiguration; 4991 isa = XCBuildConfiguration;
4992 buildSettings = { 4992 buildSettings = {
4993 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
4993 GCC_PRECOMPILE_PREFIX_HEADER = YES; 4994 GCC_PRECOMPILE_PREFIX_HEADER = YES;
4994 GCC_PREFIX_HEADER = macutil_Prefix.h; 4995 GCC_PREFIX_HEADER = macutil_Prefix.h;
4996 GCC_SYMBOLS_PRIVATE_EXTERN = NO;
4995 INFOPLIST_FILE = "AutoUpdater-Info.plist"; 4997 INFOPLIST_FILE = "AutoUpdater-Info.plist";
4996 LIBRARY_SEARCH_PATHS = "$(inherited)"; 4998 LIBRARY_SEARCH_PATHS = "$(inherited)";
4999 OTHER_LDFLAGS = "";
4997 PRODUCT_NAME = AutoUpdater; 5000 PRODUCT_NAME = AutoUpdater;
4998 }; 5001 };
4999 name = Universal; 5002 name = Universal;
@@ -5001,8 +5004,10 @@
5001 9919348009786FF300BF6EE0 /* Universal */ = { 5004 9919348009786FF300BF6EE0 /* Universal */ = {
5002 isa = XCBuildConfiguration; 5005 isa = XCBuildConfiguration;
5003 buildSettings = { 5006 buildSettings = {
5007 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5004 GCC_PRECOMPILE_PREFIX_HEADER = YES; 5008 GCC_PRECOMPILE_PREFIX_HEADER = YES;
5005 GCC_PREFIX_HEADER = macutil_Prefix.h; 5009 GCC_PREFIX_HEADER = macutil_Prefix.h;
5010 GCC_SYMBOLS_PRIVATE_EXTERN = NO;
5006 INFOPLIST_FILE = "crashreporter-Info.plist"; 5011 INFOPLIST_FILE = "crashreporter-Info.plist";
5007 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5012 LIBRARY_SEARCH_PATHS = "$(inherited)";
5008 PRODUCT_NAME = crashreporter; 5013 PRODUCT_NAME = crashreporter;
@@ -5098,6 +5103,7 @@
5098 isa = XCBuildConfiguration; 5103 isa = XCBuildConfiguration;
5099 buildSettings = { 5104 buildSettings = {
5100 COPY_PHASE_STRIP = NO; 5105 COPY_PHASE_STRIP = NO;
5106 DEAD_CODE_STRIPPING = NO;
5101 EXECUTABLE_PREFIX = lib; 5107 EXECUTABLE_PREFIX = lib;
5102 EXPORTED_SYMBOLS_FILE = ""; 5108 EXPORTED_SYMBOLS_FILE = "";
5103 GCC_DYNAMIC_NO_PIC = NO; 5109 GCC_DYNAMIC_NO_PIC = NO;
@@ -5111,6 +5117,7 @@
5111 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5117 LIBRARY_SEARCH_PATHS = "$(inherited)";
5112 PREBINDING = NO; 5118 PREBINDING = NO;
5113 PRELINK_LIBS = ""; 5119 PRELINK_LIBS = "";
5120 PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
5114 PRODUCT_NAME = fmodwrapper; 5121 PRODUCT_NAME = fmodwrapper;
5115 UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp; 5122 UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp;
5116 ZERO_LINK = NO; 5123 ZERO_LINK = NO;
@@ -5121,6 +5128,7 @@
5121 isa = XCBuildConfiguration; 5128 isa = XCBuildConfiguration;
5122 buildSettings = { 5129 buildSettings = {
5123 COPY_PHASE_STRIP = YES; 5130 COPY_PHASE_STRIP = YES;
5131 DEAD_CODE_STRIPPING = NO;
5124 EXECUTABLE_PREFIX = lib; 5132 EXECUTABLE_PREFIX = lib;
5125 EXPORTED_SYMBOLS_FILE = ""; 5133 EXPORTED_SYMBOLS_FILE = "";
5126 GCC_ENABLE_FIX_AND_CONTINUE = NO; 5134 GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -5132,6 +5140,7 @@
5132 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5140 LIBRARY_SEARCH_PATHS = "$(inherited)";
5133 PREBINDING = NO; 5141 PREBINDING = NO;
5134 PRELINK_LIBS = ""; 5142 PRELINK_LIBS = "";
5143 PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
5135 PRODUCT_NAME = fmodwrapper; 5144 PRODUCT_NAME = fmodwrapper;
5136 UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp; 5145 UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp;
5137 ZERO_LINK = NO; 5146 ZERO_LINK = NO;
@@ -5141,6 +5150,7 @@
5141 9967E90D0B37536D0087BD1B /* Universal */ = { 5150 9967E90D0B37536D0087BD1B /* Universal */ = {
5142 isa = XCBuildConfiguration; 5151 isa = XCBuildConfiguration;
5143 buildSettings = { 5152 buildSettings = {
5153 DEAD_CODE_STRIPPING = NO;
5144 EXECUTABLE_PREFIX = lib; 5154 EXECUTABLE_PREFIX = lib;
5145 EXPORTED_SYMBOLS_FILE = ""; 5155 EXPORTED_SYMBOLS_FILE = "";
5146 GCC_ENABLE_FIX_AND_CONTINUE = YES; 5156 GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -5152,6 +5162,7 @@
5152 OTHER_LDFLAGS = ""; 5162 OTHER_LDFLAGS = "";
5153 PREBINDING = NO; 5163 PREBINDING = NO;
5154 PRELINK_LIBS = ""; 5164 PRELINK_LIBS = "";
5165 PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
5155 PRODUCT_NAME = fmodwrapper; 5166 PRODUCT_NAME = fmodwrapper;
5156 UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp; 5167 UNEXPORTED_SYMBOLS_FILE = fmod_hidden_symbols.exp;
5157 ZERO_LINK = NO; 5168 ZERO_LINK = NO;
@@ -5177,8 +5188,10 @@
5177 999484450883114200EFC621 /* Development */ = { 5188 999484450883114200EFC621 /* Development */ = {
5178 isa = XCBuildConfiguration; 5189 isa = XCBuildConfiguration;
5179 buildSettings = { 5190 buildSettings = {
5191 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5180 GCC_PRECOMPILE_PREFIX_HEADER = YES; 5192 GCC_PRECOMPILE_PREFIX_HEADER = YES;
5181 GCC_PREFIX_HEADER = macutil_Prefix.h; 5193 GCC_PREFIX_HEADER = macutil_Prefix.h;
5194 GCC_SYMBOLS_PRIVATE_EXTERN = NO;
5182 INFOPLIST_FILE = "crashreporter-Info.plist"; 5195 INFOPLIST_FILE = "crashreporter-Info.plist";
5183 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5196 LIBRARY_SEARCH_PATHS = "$(inherited)";
5184 PRODUCT_NAME = crashreporter; 5197 PRODUCT_NAME = crashreporter;
@@ -5188,8 +5201,10 @@
5188 999484460883114200EFC621 /* Deployment */ = { 5201 999484460883114200EFC621 /* Deployment */ = {
5189 isa = XCBuildConfiguration; 5202 isa = XCBuildConfiguration;
5190 buildSettings = { 5203 buildSettings = {
5204 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5191 GCC_PRECOMPILE_PREFIX_HEADER = YES; 5205 GCC_PRECOMPILE_PREFIX_HEADER = YES;
5192 GCC_PREFIX_HEADER = macutil_Prefix.h; 5206 GCC_PREFIX_HEADER = macutil_Prefix.h;
5207 GCC_SYMBOLS_PRIVATE_EXTERN = NO;
5193 INFOPLIST_FILE = "crashreporter-Info.plist"; 5208 INFOPLIST_FILE = "crashreporter-Info.plist";
5194 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5209 LIBRARY_SEARCH_PATHS = "$(inherited)";
5195 PRODUCT_NAME = crashreporter; 5210 PRODUCT_NAME = crashreporter;
@@ -5199,10 +5214,13 @@
5199 9994844A0883114200EFC621 /* Development */ = { 5214 9994844A0883114200EFC621 /* Development */ = {
5200 isa = XCBuildConfiguration; 5215 isa = XCBuildConfiguration;
5201 buildSettings = { 5216 buildSettings = {
5217 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5202 GCC_PRECOMPILE_PREFIX_HEADER = YES; 5218 GCC_PRECOMPILE_PREFIX_HEADER = YES;
5203 GCC_PREFIX_HEADER = macutil_Prefix.h; 5219 GCC_PREFIX_HEADER = macutil_Prefix.h;
5220 GCC_SYMBOLS_PRIVATE_EXTERN = NO;
5204 INFOPLIST_FILE = "AutoUpdater-Info.plist"; 5221 INFOPLIST_FILE = "AutoUpdater-Info.plist";
5205 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5222 LIBRARY_SEARCH_PATHS = "$(inherited)";
5223 OTHER_LDFLAGS = "";
5206 PRODUCT_NAME = AutoUpdater; 5224 PRODUCT_NAME = AutoUpdater;
5207 }; 5225 };
5208 name = Development; 5226 name = Development;
@@ -5210,10 +5228,13 @@
5210 9994844B0883114200EFC621 /* Deployment */ = { 5228 9994844B0883114200EFC621 /* Deployment */ = {
5211 isa = XCBuildConfiguration; 5229 isa = XCBuildConfiguration;
5212 buildSettings = { 5230 buildSettings = {
5231 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5213 GCC_PRECOMPILE_PREFIX_HEADER = YES; 5232 GCC_PRECOMPILE_PREFIX_HEADER = YES;
5214 GCC_PREFIX_HEADER = macutil_Prefix.h; 5233 GCC_PREFIX_HEADER = macutil_Prefix.h;
5234 GCC_SYMBOLS_PRIVATE_EXTERN = NO;
5215 INFOPLIST_FILE = "AutoUpdater-Info.plist"; 5235 INFOPLIST_FILE = "AutoUpdater-Info.plist";
5216 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5236 LIBRARY_SEARCH_PATHS = "$(inherited)";
5237 OTHER_LDFLAGS = "";
5217 PRODUCT_NAME = AutoUpdater; 5238 PRODUCT_NAME = AutoUpdater;
5218 }; 5239 };
5219 name = Deployment; 5240 name = Deployment;
@@ -5234,7 +5255,10 @@
5234 "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", 5255 "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
5235 ); 5256 );
5236 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\""; 5257 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
5237 OTHER_LDFLAGS = "-weak-lllmozlib"; 5258 OTHER_LDFLAGS = (
5259 "-weak-lllmozlib",
5260 "-Wl,-search_paths_first",
5261 );
5238 PRODUCT_NAME = "Second Life"; 5262 PRODUCT_NAME = "Second Life";
5239 SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders"; 5263 SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
5240 WARNING_CFLAGS = ( 5264 WARNING_CFLAGS = (
@@ -5264,7 +5288,10 @@
5264 ); 5288 );
5265 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\""; 5289 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
5266 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\""; 5290 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
5267 OTHER_LDFLAGS = "-lllmozlib"; 5291 OTHER_LDFLAGS = (
5292 "-lllmozlib",
5293 "-Wl,-search_paths_first",
5294 );
5268 PRODUCT_NAME = "Second Life"; 5295 PRODUCT_NAME = "Second Life";
5269 SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders"; 5296 SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
5270 WRAPPER_EXTENSION = app; 5297 WRAPPER_EXTENSION = app;
@@ -5395,10 +5422,12 @@
5395 GCC_DYNAMIC_NO_PIC = NO; 5422 GCC_DYNAMIC_NO_PIC = NO;
5396 GCC_ENABLE_FIX_AND_CONTINUE = YES; 5423 GCC_ENABLE_FIX_AND_CONTINUE = YES;
5397 GCC_GENERATE_DEBUGGING_SYMBOLS = YES; 5424 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
5425 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5398 GCC_MODEL_TUNING = G5; 5426 GCC_MODEL_TUNING = G5;
5399 GCC_OPTIMIZATION_LEVEL = 0; 5427 GCC_OPTIMIZATION_LEVEL = 0;
5400 INSTALL_PATH = "@executable_path/../Resources/"; 5428 INSTALL_PATH = "@executable_path/../Resources/";
5401 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5429 LIBRARY_SEARCH_PATHS = "$(inherited)";
5430 OTHER_LDFLAGS = "-Wl,-search_paths_first";
5402 PREBINDING = NO; 5431 PREBINDING = NO;
5403 PRODUCT_NAME = llkdu; 5432 PRODUCT_NAME = llkdu;
5404 ZERO_LINK = YES; 5433 ZERO_LINK = YES;
@@ -5412,11 +5441,13 @@
5412 EXECUTABLE_PREFIX = lib; 5441 EXECUTABLE_PREFIX = lib;
5413 GCC_ENABLE_FIX_AND_CONTINUE = NO; 5442 GCC_ENABLE_FIX_AND_CONTINUE = NO;
5414 GCC_GENERATE_DEBUGGING_SYMBOLS = NO; 5443 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
5444 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5415 GCC_MODEL_TUNING = G5; 5445 GCC_MODEL_TUNING = G5;
5416 INSTALL_PATH = "@executable_path/../Resources/"; 5446 INSTALL_PATH = "@executable_path/../Resources/";
5417 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5447 LIBRARY_SEARCH_PATHS = "$(inherited)";
5418 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment\""; 5448 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment\"";
5419 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\""; 5449 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\"";
5450 OTHER_LDFLAGS = "-Wl,-search_paths_first";
5420 PREBINDING = NO; 5451 PREBINDING = NO;
5421 PRODUCT_NAME = llkdu; 5452 PRODUCT_NAME = llkdu;
5422 ZERO_LINK = NO; 5453 ZERO_LINK = NO;
@@ -5428,11 +5459,13 @@
5428 buildSettings = { 5459 buildSettings = {
5429 EXECUTABLE_PREFIX = lib; 5460 EXECUTABLE_PREFIX = lib;
5430 GCC_ENABLE_FIX_AND_CONTINUE = YES; 5461 GCC_ENABLE_FIX_AND_CONTINUE = YES;
5462 GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
5431 GCC_MODEL_TUNING = G5; 5463 GCC_MODEL_TUNING = G5;
5432 INSTALL_PATH = "@executable_path/../Resources/"; 5464 INSTALL_PATH = "@executable_path/../Resources/";
5433 LIBRARY_SEARCH_PATHS = "$(inherited)"; 5465 LIBRARY_SEARCH_PATHS = "$(inherited)";
5434 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment"; 5466 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Deployment";
5435 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\""; 5467 LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../libraries/powerpc-darwin/lib_release\"";
5468 OTHER_LDFLAGS = "-Wl,-search_paths_first";
5436 PREBINDING = NO; 5469 PREBINDING = NO;
5437 PRODUCT_NAME = llkdu; 5470 PRODUCT_NAME = llkdu;
5438 ZERO_LINK = YES; 5471 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
10 10
11:debug 11:debug
12echo copying debug files 12echo copying debug files
13copy ..\..\libraries\i686-win32\lib_debug\freebl3.dll .\debug\ /y 13xcopy ..\..\libraries\i686-win32\lib_debug\freebl3.dll .\debug\ /y
14copy ..\..\libraries\i686-win32\lib_debug\gksvggdiplus.dll .\debug\ /y 14xcopy ..\..\libraries\i686-win32\lib_debug\gksvggdiplus.dll .\debug\ /y
15copy ..\..\libraries\i686-win32\lib_debug\js3250.dll .\debug\ /y 15xcopy ..\..\libraries\i686-win32\lib_debug\js3250.dll .\debug\ /y
16copy ..\..\libraries\i686-win32\lib_debug\nspr4.dll .\debug\ /y 16xcopy ..\..\libraries\i686-win32\lib_debug\nspr4.dll .\debug\ /y
17copy ..\..\libraries\i686-win32\lib_debug\nss3.dll .\debug\ /y 17xcopy ..\..\libraries\i686-win32\lib_debug\nss3.dll .\debug\ /y
18copy ..\..\libraries\i686-win32\lib_debug\nssckbi.dll .\debug\ /y 18xcopy ..\..\libraries\i686-win32\lib_debug\nssckbi.dll .\debug\ /y
19copy ..\..\libraries\i686-win32\lib_debug\plc4.dll .\debug\ /y 19xcopy ..\..\libraries\i686-win32\lib_debug\plc4.dll .\debug\ /y
20copy ..\..\libraries\i686-win32\lib_debug\plds4.dll .\debug\ /y 20xcopy ..\..\libraries\i686-win32\lib_debug\plds4.dll .\debug\ /y
21copy ..\..\libraries\i686-win32\lib_debug\smime3.dll .\debug\ /y 21xcopy ..\..\libraries\i686-win32\lib_debug\smime3.dll .\debug\ /y
22copy ..\..\libraries\i686-win32\lib_debug\softokn3.dll .\debug\ /y 22xcopy ..\..\libraries\i686-win32\lib_debug\softokn3.dll .\debug\ /y
23copy ..\..\libraries\i686-win32\lib_debug\ssl3.dll .\debug\ /y 23xcopy ..\..\libraries\i686-win32\lib_debug\ssl3.dll .\debug\ /y
24copy ..\..\libraries\i686-win32\lib_debug\xpcom.dll .\debug\ /y 24xcopy ..\..\libraries\i686-win32\lib_debug\xpcom.dll .\debug\ /y
25copy ..\..\libraries\i686-win32\lib_debug\xul.dll .\debug\ /y 25xcopy ..\..\libraries\i686-win32\lib_debug\xul.dll .\debug\ /y
26copy ..\..\libraries\i686-win32\lib_debug\openjpeg.dll .\debug\ /y 26xcopy ..\..\libraries\i686-win32\lib_debug\openjpeg.dll .\debug\ /y
27rem --- this is required for mozilla debug builds and displays the aborty/retry/ignore dialog on an assert - crashes without it --- 27rem --- this is required for mozilla debug builds and displays the aborty/retry/ignore dialog on an assert - crashes without it ---
28copy ..\..\libraries\i686-win32\lib_debug\windbgdlg.exe .\debug\ /y 28xcopy ..\..\libraries\i686-win32\lib_debug\windbgdlg.exe .\debug\ /y
29 29
30rem --- runtime pieces for the bHear stuff. 30rem --- runtime pieces for the bHear stuff.
31copy .\vivox-runtime\i686-win32\tntk.dll .\ /y 31xcopy .\vivox-runtime\i686-win32\tntk.dll .\ /y
32copy .\vivox-runtime\i686-win32\libeay32.dll .\ /y 32xcopy .\vivox-runtime\i686-win32\libeay32.dll .\ /y
33copy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y 33xcopy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y
34copy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y 34xcopy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y
35copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y 35xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y
36copy .\vivox-runtime\i686-win32\srtp.dll .\ /y 36xcopy .\vivox-runtime\i686-win32\srtp.dll .\ /y
37copy .\vivox-runtime\i686-win32\alut.dll .\ /y 37xcopy .\vivox-runtime\i686-win32\alut.dll .\ /y
38copy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y 38xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y
39copy .\vivox-runtime\i686-win32\ortp.dll .\ /y 39xcopy .\vivox-runtime\i686-win32\ortp.dll .\ /y
40copy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y 40xcopy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y
41 41
42@IF NOT EXIST ..\llkdu\Debug\llkdu.dll ( 42@IF NOT EXIST ..\llkdu\Debug\llkdu.dll (
43 @IF EXIST ..\..\libraries\i686-win32\lib_debug\llkdu.dll ( 43 @IF EXIST ..\..\libraries\i686-win32\lib_debug\llkdu.dll (
@@ -53,108 +53,108 @@ goto end
53 53
54:release 54:release
55echo copying release files 55echo copying release files
56copy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\Release\ /y 56xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\Release\ /y
57copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\Release\ /y 57xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\Release\ /y
58copy ..\..\libraries\i686-win32\lib_release\js3250.dll .\Release\ /y 58xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll .\Release\ /y
59copy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\Release\ /y 59xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\Release\ /y
60copy ..\..\libraries\i686-win32\lib_release\nss3.dll .\Release\ /y 60xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll .\Release\ /y
61copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\Release\ /y 61xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\Release\ /y
62copy ..\..\libraries\i686-win32\lib_release\plc4.dll .\Release\ /y 62xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll .\Release\ /y
63copy ..\..\libraries\i686-win32\lib_release\plds4.dll .\Release\ /y 63xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll .\Release\ /y
64copy ..\..\libraries\i686-win32\lib_release\smime3.dll .\Release\ /y 64xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll .\Release\ /y
65copy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\Release\ /y 65xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\Release\ /y
66copy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\Release\ /y 66xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\Release\ /y
67copy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\Release\ /y 67xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\Release\ /y
68copy ..\..\libraries\i686-win32\lib_release\xul.dll .\Release\ /y 68xcopy ..\..\libraries\i686-win32\lib_release\xul.dll .\Release\ /y
69copy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\Release\ /y 69xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\Release\ /y
70 70
71rem --- runtime pieces for the bHear stuff. 71rem --- runtime pieces for the bHear stuff.
72copy .\vivox-runtime\i686-win32\tntk.dll .\ /y 72xcopy .\vivox-runtime\i686-win32\tntk.dll .\ /y
73copy .\vivox-runtime\i686-win32\libeay32.dll .\ /y 73xcopy .\vivox-runtime\i686-win32\libeay32.dll .\ /y
74copy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y 74xcopy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y
75copy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y 75xcopy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y
76copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y 76xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y
77copy .\vivox-runtime\i686-win32\srtp.dll .\ /y 77xcopy .\vivox-runtime\i686-win32\srtp.dll .\ /y
78copy .\vivox-runtime\i686-win32\alut.dll .\ /y 78xcopy .\vivox-runtime\i686-win32\alut.dll .\ /y
79copy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y 79xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y
80copy .\vivox-runtime\i686-win32\ortp.dll .\ /y 80xcopy .\vivox-runtime\i686-win32\ortp.dll .\ /y
81copy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y 81xcopy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y
82 82
83@IF NOT EXIST ..\llkdu\Release\llkdu.dll ( 83@IF NOT EXIST ..\llkdu\Release\llkdu.dll (
84 copy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\Release\ /y 84 xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\Release\ /y
85) ELSE ( 85) ELSE (
86 copy ..\llkdu\Release\llkdu.dll .\Release\ /y 86 xcopy ..\llkdu\Release\llkdu.dll .\Release\ /y
87) 87)
88goto end 88goto end
89 89
90:releasenoopt 90:releasenoopt
91echo copying releasenoopt files 91echo copying releasenoopt files
92copy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseNoOpt\ /y 92xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseNoOpt\ /y
93copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseNoOpt\ /y 93xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseNoOpt\ /y
94copy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseNoOpt\ /y 94xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseNoOpt\ /y
95copy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseNoOpt\ /y 95xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseNoOpt\ /y
96copy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseNoOpt\ /y 96xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseNoOpt\ /y
97copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseNoOpt\ /y 97xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseNoOpt\ /y
98copy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseNoOpt\ /y 98xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseNoOpt\ /y
99copy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseNoOpt\ /y 99xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseNoOpt\ /y
100copy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseNoOpt\ /y 100xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseNoOpt\ /y
101copy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseNoOpt\ /y 101xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseNoOpt\ /y
102copy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseNoOpt\ /y 102xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseNoOpt\ /y
103copy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseNoOpt\ /y 103xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseNoOpt\ /y
104copy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseNoOpt\ /y 104xcopy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseNoOpt\ /y
105copy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseNoOpt\ /y 105xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseNoOpt\ /y
106 106
107rem --- runtime pieces for the bHear stuff. 107rem --- runtime pieces for the bHear stuff.
108copy .\vivox-runtime\i686-win32\tntk.dll . /y 108xcopy .\vivox-runtime\i686-win32\tntk.dll . /y
109copy .\vivox-runtime\i686-win32\libeay32.dll . /y 109xcopy .\vivox-runtime\i686-win32\libeay32.dll . /y
110copy .\vivox-runtime\i686-win32\SLVoice.exe . /y 110xcopy .\vivox-runtime\i686-win32\SLVoice.exe . /y
111copy .\vivox-runtime\i686-win32\ssleay32.dll . /y 111xcopy .\vivox-runtime\i686-win32\ssleay32.dll . /y
112copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe . /y 112xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe . /y
113copy .\vivox-runtime\i686-win32\srtp.dll . /y 113xcopy .\vivox-runtime\i686-win32\srtp.dll . /y
114copy .\vivox-runtime\i686-win32\alut.dll . /y 114xcopy .\vivox-runtime\i686-win32\alut.dll . /y
115copy .\vivox-runtime\i686-win32\vivoxsdk.dll . /y 115xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll . /y
116copy .\vivox-runtime\i686-win32\ortp.dll . /y 116xcopy .\vivox-runtime\i686-win32\ortp.dll . /y
117copy .\vivox-runtime\i686-win32\wrap_oal.dll . /y 117xcopy .\vivox-runtime\i686-win32\wrap_oal.dll . /y
118 118
119@IF NOT EXIST ..\llkdu\ReleaseNoOpt\llkdu.dll ( 119@IF NOT EXIST ..\llkdu\ReleaseNoOpt\llkdu.dll (
120 copy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseNoOpt\ /y 120 xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseNoOpt\ /y
121) ELSE ( 121) ELSE (
122 copy ..\llkdu\ReleaseNoOpt\llkdu.dll .\ReleaseNoOpt\ /y 122 xcopy ..\llkdu\ReleaseNoOpt\llkdu.dll .\ReleaseNoOpt\ /y
123) 123)
124goto end 124goto end
125 125
126:releasefordownload 126:releasefordownload
127echo copying releasefordownload files 127echo copying releasefordownload files
128copy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseForDownload\ /y 128xcopy ..\..\libraries\i686-win32\lib_release\freebl3.dll .\ReleaseForDownload\ /y
129copy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseForDownload\ /y 129xcopy ..\..\libraries\i686-win32\lib_release\gksvggdiplus.dll .\ReleaseForDownload\ /y
130copy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseForDownload\ /y 130xcopy ..\..\libraries\i686-win32\lib_release\js3250.dll .\ReleaseForDownload\ /y
131copy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseForDownload\ /y 131xcopy ..\..\libraries\i686-win32\lib_release\nspr4.dll .\ReleaseForDownload\ /y
132copy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseForDownload\ /y 132xcopy ..\..\libraries\i686-win32\lib_release\nss3.dll .\ReleaseForDownload\ /y
133copy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseForDownload\ /y 133xcopy ..\..\libraries\i686-win32\lib_release\nssckbi.dll .\ReleaseForDownload\ /y
134copy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseForDownload\ /y 134xcopy ..\..\libraries\i686-win32\lib_release\plc4.dll .\ReleaseForDownload\ /y
135copy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseForDownload\ /y 135xcopy ..\..\libraries\i686-win32\lib_release\plds4.dll .\ReleaseForDownload\ /y
136copy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseForDownload\ /y 136xcopy ..\..\libraries\i686-win32\lib_release\smime3.dll .\ReleaseForDownload\ /y
137copy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseForDownload\ /y 137xcopy ..\..\libraries\i686-win32\lib_release\softokn3.dll .\ReleaseForDownload\ /y
138copy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseForDownload\ /y 138xcopy ..\..\libraries\i686-win32\lib_release\ssl3.dll .\ReleaseForDownload\ /y
139copy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseForDownload\ /y 139xcopy ..\..\libraries\i686-win32\lib_release\xpcom.dll .\ReleaseForDownload\ /y
140copy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseForDownload\ /y 140xcopy ..\..\libraries\i686-win32\lib_release\xul.dll .\ReleaseForDownload\ /y
141copy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseForDownload\ /y 141xcopy ..\..\libraries\i686-win32\lib_release\openjpeg.dll .\ReleaseForDownload\ /y
142rem --- runtime pieces for the bHear stuff. 142rem --- runtime pieces for the bHear stuff.
143copy .\vivox-runtime\i686-win32\tntk.dll .\ /y 143xcopy .\vivox-runtime\i686-win32\tntk.dll .\ /y
144copy .\vivox-runtime\i686-win32\libeay32.dll .\ /y 144xcopy .\vivox-runtime\i686-win32\libeay32.dll .\ /y
145copy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y 145xcopy .\vivox-runtime\i686-win32\SLVoice.exe .\ /y
146copy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y 146xcopy .\vivox-runtime\i686-win32\ssleay32.dll .\ /y
147copy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y 147xcopy .\vivox-runtime\i686-win32\SLVoiceAgent.exe .\ /y
148copy .\vivox-runtime\i686-win32\srtp.dll .\ /y 148xcopy .\vivox-runtime\i686-win32\srtp.dll .\ /y
149copy .\vivox-runtime\i686-win32\alut.dll .\ /y 149xcopy .\vivox-runtime\i686-win32\alut.dll .\ /y
150copy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y 150xcopy .\vivox-runtime\i686-win32\vivoxsdk.dll .\ /y
151copy .\vivox-runtime\i686-win32\ortp.dll .\ /y 151xcopy .\vivox-runtime\i686-win32\ortp.dll .\ /y
152copy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y 152xcopy .\vivox-runtime\i686-win32\wrap_oal.dll .\ /y
153 153
154@IF NOT EXIST ..\llkdu\Release\llkdu.dll ( 154@IF NOT EXIST ..\llkdu\Release\llkdu.dll (
155 copy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseForDownload\ /y 155 xcopy ..\..\libraries\i686-win32\lib_release\llkdu.dll .\ReleaseForDownload\ /y
156) ELSE ( 156) ELSE (
157 copy ..\llkdu\Release\llkdu.dll .\ReleaseForDownload\ /y 157 xcopy ..\llkdu\Release\llkdu.dll .\ReleaseForDownload\ /y
158) 158)
159 159
160goto end 160goto 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 @@
1Release Notes for Second Life 1.18.5(1) November 16, 2007
2=====================================
3Changes:
4* Search button always enabled in Search All panel
5** Empty searches show the classifieds splash page
6* Teleport is the first option listed for landmarks in inventory
7
8Bug fixes:
9* Fixed search turning transparent instead of minimizing
10* Fixed VWR-3073: Right-clicking someone's attachments to view profile loads (???) (???) instead
11
1Release Notes for Second Life 1.18.5(0) November 13, 2007 12Release Notes for Second Life 1.18.5(0) November 13, 2007
2===================================== 13=====================================
3New features: 14New 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"
228// 228//
229 229
230VS_VERSION_INFO VERSIONINFO 230VS_VERSION_INFO VERSIONINFO
231 FILEVERSION 1,18,5,0 231 FILEVERSION 1,18,5,1
232 PRODUCTVERSION 1,18,5,0 232 PRODUCTVERSION 1,18,5,1
233 FILEFLAGSMASK 0x3fL 233 FILEFLAGSMASK 0x3fL
234#ifdef _DEBUG 234#ifdef _DEBUG
235 FILEFLAGS 0x1L 235 FILEFLAGS 0x1L
@@ -246,12 +246,12 @@ BEGIN
246 BEGIN 246 BEGIN
247 VALUE "CompanyName", "Linden Lab" 247 VALUE "CompanyName", "Linden Lab"
248 VALUE "FileDescription", "Second Life" 248 VALUE "FileDescription", "Second Life"
249 VALUE "FileVersion", "1.18.5.0" 249 VALUE "FileVersion", "1.18.5.1"
250 VALUE "InternalName", "Second Life" 250 VALUE "InternalName", "Second Life"
251 VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc." 251 VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
252 VALUE "OriginalFilename", "SecondLife.exe" 252 VALUE "OriginalFilename", "SecondLife.exe"
253 VALUE "ProductName", "Second Life" 253 VALUE "ProductName", "Second Life"
254 VALUE "ProductVersion", "1.18.5.0" 254 VALUE "ProductVersion", "1.18.5.1"
255 END 255 END
256 END 256 END
257 BLOCK "VarFileInfo" 257 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 @@
109 <on_click filter="" function="Inventory.DoCreate" userdata="eyes" /> 109 <on_click filter="" function="Inventory.DoCreate" userdata="eyes" />
110 </menu_item_call> 110 </menu_item_call>
111 </menu> 111 </menu>
112 <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Open" left="0" 112 <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Teleport" left="0"
113 mouse_opaque="true" name="Landmark Open" width="128"> 113 mouse_opaque="true" name="Landmark Open" width="128">
114 <on_click filter="" function="Inventory.DoToSelected" userdata="open" /> 114 <on_click filter="" function="Inventory.DoToSelected" userdata="open" />
115 </menu_item_call> 115 </menu_item_call>
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 )
1330#endif // LL_WINDOWS 1330#endif // LL_WINDOWS
1331 1331
1332 // Build a string representing the current version number. 1332 // Build a string representing the current version number.
1333 gCurrentVersion = llformat("%s %d.%d.%d.%d", LL_CHANNEL, LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD ); 1333 gCurrentVersion = llformat("%s %d.%d.%d.%d", gChannelName.c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD );
1334 1334
1335 // 1335 //
1336 // Various introspection concerning the libs we're using 1336 // Various introspection concerning the libs we're using
generated by cgit v1.1 at 2024-11-15 09:26:12 +0000