[sldev-commits] r1706 - in branches/maint-viewer: doc indra/llcharacter indra/llcommon indra/llmedia indra/llvfs indra/newview indra/newview/English.lproj indra/newview/res indra/newview/skins/default/xui/en-us

cg.linden at svn.secondlife.com cg.linden at svn.secondlife.com
Thu Jan 22 20:35:23 PST 2009


Author: cg.linden
Date: 2009-01-22 22:35:23 -0600 (Thu, 22 Jan 2009)
New Revision: 1706

Modified:
   branches/maint-viewer/doc/asset_urls.txt
   branches/maint-viewer/indra/llcharacter/llkeyframemotionparam.cpp
   branches/maint-viewer/indra/llcommon/llversionserver.h
   branches/maint-viewer/indra/llcommon/llversionviewer.h
   branches/maint-viewer/indra/llmedia/llmediaimplllmozlib.cpp
   branches/maint-viewer/indra/llvfs/llvfs.cpp
   branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings
   branches/maint-viewer/indra/newview/Info-SecondLife.plist
   branches/maint-viewer/indra/newview/res/viewerRes.rc
   branches/maint-viewer/indra/newview/skins/default/xui/en-us/menu_viewer.xml
Trac: http://svn.secondlife.com/trac/linden/changeset/1706
Log:
Snapshot of internal branch maint-viewer
Internal URL: http://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-12
Revision Range: 108641 to 108641

Supplementary files:
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-darwin-libs-maint-viewer-1.22.0.108641.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.108641.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.108641.zip
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.108641.zip
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.108641.txt
Source tarballs - redundant to this svn:
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-src-maint-viewer-1.22.0.108641.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-src-maint-viewer-1.22.0.108641.zip


Modified: branches/maint-viewer/doc/asset_urls.txt
===================================================================
--- branches/maint-viewer/doc/asset_urls.txt	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/doc/asset_urls.txt	2009-01-23 04:35:23 UTC (rev 1706)
@@ -1,5 +1,5 @@
-SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-darwin-libs-maint-viewer-1.22.0.108609.tar.gz
-SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.108609.tar.gz
-SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.108609.zip
-SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.108609.zip
-SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.108609.txt
+SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-darwin-libs-maint-viewer-1.22.0.108641.tar.gz
+SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.108641.tar.gz
+SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.108641.zip
+SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.108641.zip
+SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.108641.txt

Modified: branches/maint-viewer/indra/llcharacter/llkeyframemotionparam.cpp
===================================================================
--- branches/maint-viewer/indra/llcharacter/llkeyframemotionparam.cpp	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/llcharacter/llkeyframemotionparam.cpp	2009-01-23 04:35:23 UTC (rev 1706)
@@ -391,7 +391,7 @@
 	//-------------------------------------------------------------------------
 	// check for error
 	//-------------------------------------------------------------------------
-	llassert( p <= (&text[fileSize]) );
+	llassert( p <= (&text[0] + fileSize) );
 
 	if ( error )
 	{

Modified: branches/maint-viewer/indra/llcommon/llversionserver.h
===================================================================
--- branches/maint-viewer/indra/llcommon/llversionserver.h	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/llcommon/llversionserver.h	2009-01-23 04:35:23 UTC (rev 1706)
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 25;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 108609;
+const S32 LL_VERSION_BUILD = 108641;
 
 const char * const LL_CHANNEL = "Second Life Server";
 

Modified: branches/maint-viewer/indra/llcommon/llversionviewer.h
===================================================================
--- branches/maint-viewer/indra/llcommon/llversionviewer.h	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/llcommon/llversionviewer.h	2009-01-23 04:35:23 UTC (rev 1706)
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 22;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 108609;
+const S32 LL_VERSION_BUILD = 108641;
 
 const char * const LL_CHANNEL = "Second Life Release";
 

Modified: branches/maint-viewer/indra/llmedia/llmediaimplllmozlib.cpp
===================================================================
--- branches/maint-viewer/indra/llmedia/llmediaimplllmozlib.cpp	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/llmedia/llmediaimplllmozlib.cpp	2009-01-23 04:35:23 UTC (rev 1706)
@@ -611,9 +611,12 @@
 // virtual
 bool LLMediaImplLLMozLib::reset()
 {
-	LLMozLib::getInstance()->remObserver( mWindowId, this );
+	if (mWindowId != 0)
+	{
+		LLMozLib::getInstance()->remObserver( mWindowId, this );
 
-	LLMozLib::getInstance()->destroyBrowserWindow( mWindowId );
+		LLMozLib::getInstance()->destroyBrowserWindow( mWindowId );
+	}
 
 	mWindowId = 0;
 

Modified: branches/maint-viewer/indra/llvfs/llvfs.cpp
===================================================================
--- branches/maint-viewer/indra/llvfs/llvfs.cpp	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/llvfs/llvfs.cpp	2009-01-23 04:35:23 UTC (rev 1706)
@@ -354,17 +354,16 @@
 		)
 	{	
 		std::vector<U8> buffer(fbuf.st_size);
+    		size_t buf_offset = 0;
 		size_t nread = fread(&buffer[0], 1, fbuf.st_size, mIndexFP);
-    
-		U8 *tmp_ptr = &buffer[0];
-    
+ 
 		std::vector<LLVFSFileBlock*> files_by_loc;
 		
-		while (tmp_ptr < &buffer[nread])
+		while (buf_offset < nread)
 		{
 			LLVFSFileBlock *block = new LLVFSFileBlock();
     
-			block->deserialize(tmp_ptr, (S32)(tmp_ptr - &buffer[0]));
+			block->deserialize(&buffer[buf_offset], (S32)buf_offset);
     
 			// Do sanity check on this block.
 			// Note that this skips zero size blocks, which helps VFS
@@ -404,13 +403,12 @@
 			else
 			{
 				// this is a null or bad entry, skip it
-				S32 index_loc = (S32)(tmp_ptr - &buffer[0]);
-				mIndexHoles.push_back(index_loc);
+				mIndexHoles.push_back(buf_offset);
     
 				delete block;
 			}
     
-			tmp_ptr += LLVFSFileBlock::SERIAL_SIZE;
+			buf_offset += LLVFSFileBlock::SERIAL_SIZE;
 		}
 
 		std::sort(
@@ -832,20 +830,18 @@
 					if (block->mSize > 0)
 					{
 						// move the file into the new block
-						U8 *buffer = new U8[block->mSize];
+						std::vector<U8> buffer(block->mSize);
 						fseek(mDataFP, block->mLocation, SEEK_SET);
-						if (fread(buffer, block->mSize, 1, mDataFP) == 1)
+						if (fread(&buffer[0], block->mSize, 1, mDataFP) == 1)
 						{
 							fseek(mDataFP, free_block->mLocation, SEEK_SET);
-							if (fwrite(buffer, block->mSize, 1, mDataFP) != 1)
+							if (fwrite(&buffer[0], block->mSize, 1, mDataFP) != 1)
 							{
 								llwarns << "Short write" << llendl;
 							}
 						} else {
 							llwarns << "Short read" << llendl;
 						}
-    
-						delete[] buffer;
 					}
 				}
     
@@ -1678,7 +1674,7 @@
 	fflush(mIndexFP);
 
 	fseek(mIndexFP, 0, SEEK_END);
-	long index_size = ftell(mIndexFP);
+	size_t index_size = ftell(mIndexFP);
 	fseek(mIndexFP, 0, SEEK_SET);
     
 	BOOL vfs_corrupt = FALSE;
@@ -1691,19 +1687,19 @@
 		vfs_corrupt = TRUE;
 	}
     
-	U8 *tmp_ptr = &buffer[0];
+	size_t buf_offset = 0;
     
 	std::map<LLVFSFileSpecifier, LLVFSFileBlock*>	found_files;
 	U32 cur_time = (U32)time(NULL);
 
 	std::vector<LLVFSFileBlock*> audit_blocks;
-	while (!vfs_corrupt && tmp_ptr < &buffer[index_size])
+	while (!vfs_corrupt && buf_offset < index_size)
 	{
 		LLVFSFileBlock *block = new LLVFSFileBlock();
 		audit_blocks.push_back(block);
 		
-		block->deserialize(tmp_ptr, (S32)(tmp_ptr - &buffer[0]));
-		tmp_ptr += block->SERIAL_SIZE;
+		block->deserialize(&buffer[buf_offset], (S32)buf_offset);
+		buf_offset += block->SERIAL_SIZE;
     
 		// do sanity check on this block
 		if (block->mLength >= 0 &&
@@ -2056,19 +2052,18 @@
 		{
 			LLUUID id = file_spec.mFileID;
 			LLAssetType::EType type = file_spec.mFileType;
-			U8* buffer = new U8[size];
+			std::vector<U8> buffer(size);
 
 			unlockData();
-			getData(id, type, buffer, 0, size);
+			getData(id, type, &buffer[0], 0, size);
 			lockData();
 			
 			std::string extension = get_extension(type);
 			std::string filename = id.asString() + extension;
 			llinfos << " Writing " << filename << llendl;
 			apr_file_t* file = ll_apr_file_open(filename, LL_APR_WB);
-			ll_apr_file_write(file, buffer, size);
+			ll_apr_file_write(file, &buffer[0], size);
 			apr_file_close(file);
-			delete[] buffer;
 			files_extracted++;
 		}
 	}

Modified: branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings
===================================================================
--- branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings	2009-01-23 04:35:23 UTC (rev 1706)
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.22.0.108609";
-CFBundleGetInfoString = "Second Life version 1.22.0.108609, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.22.0.108641";
+CFBundleGetInfoString = "Second Life version 1.22.0.108641, Copyright 2004-2008 Linden Research, Inc.";
 

Modified: branches/maint-viewer/indra/newview/Info-SecondLife.plist
===================================================================
--- branches/maint-viewer/indra/newview/Info-SecondLife.plist	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/newview/Info-SecondLife.plist	2009-01-23 04:35:23 UTC (rev 1706)
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.22.0.108609</string>
+	<string>1.22.0.108641</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

Modified: branches/maint-viewer/indra/newview/res/viewerRes.rc
===================================================================
--- branches/maint-viewer/indra/newview/res/viewerRes.rc	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/newview/res/viewerRes.rc	2009-01-23 04:35:23 UTC (rev 1706)
@@ -138,8 +138,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,22,0,108609
- PRODUCTVERSION 1,22,0,108609
+ FILEVERSION 1,22,0,108641
+ PRODUCTVERSION 1,22,0,108641
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.22.0.108609"
+            VALUE "FileVersion", "1.22.0.108641"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.22.0.108609"
+            VALUE "ProductVersion", "1.22.0.108641"
         END
     END
     BLOCK "VarFileInfo"

Modified: branches/maint-viewer/indra/newview/skins/default/xui/en-us/menu_viewer.xml
===================================================================
--- branches/maint-viewer/indra/newview/skins/default/xui/en-us/menu_viewer.xml	2009-01-23 01:48:53 UTC (rev 1705)
+++ branches/maint-viewer/indra/newview/skins/default/xui/en-us/menu_viewer.xml	2009-01-23 04:35:23 UTC (rev 1706)
@@ -748,13 +748,13 @@
 		<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
 		     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
 		     name="Bug Reporting" opaque="true" tear_off="true" width="118">
-			<menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
-			     left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
+			<menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
+			     mouse_opaque="true" name="Report Bug..." width="166">
 				<on_click function="PromptShowURL"
 				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
 			</menu_item_call>
-			<menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
-			     left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
+			<menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting Help..."
+			     left="0" mouse_opaque="true" name="Bug Reporting Help..." width="166">
 				<on_click function="PromptShowURL"
 				     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
 			</menu_item_call>
@@ -770,18 +770,11 @@
 				<on_click function="PromptShowURL"
 				     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
 			</menu_item_call>
-			<menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
-			     mouse_opaque="true" name="QA Wiki..." width="166">
+			<menu_item_call bottom="-94" enabled="true" height="19" label="QA Portal..." left="0"
+			     mouse_opaque="true" name="QA Portal..." width="166">
 				<on_click function="PromptShowURL"
 				     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
 			</menu_item_call>
-			<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator9" width="250" />
-			<menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
-			     mouse_opaque="true" name="Report Bug..." width="166">
-				<on_click function="PromptShowURL"
-				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-			</menu_item_call>
 		</menu>
 		<menu_item_call bottom="-313" enabled="true" height="19" label="About Second Life..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">



More information about the sldev-commits mailing list