[sldev-commits] r2371 - in branches/viewer_1-23_frozen: . doc indra/llcommon 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
Tue Jun 9 09:44:57 PDT 2009


Author: cg.linden
Date: 2009-06-09 11:44:57 -0500 (Tue, 09 Jun 2009)
New Revision: 2371

Modified:
   branches/viewer_1-23_frozen/
   branches/viewer_1-23_frozen/doc/asset_urls.txt
   branches/viewer_1-23_frozen/indra/llcommon/llversionserver.h
   branches/viewer_1-23_frozen/indra/llcommon/llversionviewer.h
   branches/viewer_1-23_frozen/indra/newview/English.lproj/InfoPlist.strings
   branches/viewer_1-23_frozen/indra/newview/Info-SecondLife.plist
   branches/viewer_1-23_frozen/indra/newview/llfloatercustomize.cpp
   branches/viewer_1-23_frozen/indra/newview/llviewerobject.cpp
   branches/viewer_1-23_frozen/indra/newview/llviewerobject.h
   branches/viewer_1-23_frozen/indra/newview/llvovolume.cpp
   branches/viewer_1-23_frozen/indra/newview/llvovolume.h
   branches/viewer_1-23_frozen/indra/newview/res/viewerRes.rc
   branches/viewer_1-23_frozen/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
Trac: http://svn.secondlife.com/trac/linden/changeset/2371
Log:
Snapshot of internal branch viewer-rc-frozen
Internal URL: http://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.4
Revision Range: 123522 to 123523

Supplementary files:
  http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-darwin-libs-viewer-rc-frozen-1.23.4.123523.tar.gz
  http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-linux-libs-viewer-rc-frozen-1.23.4.123523.tar.gz
  http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-win32-libs-viewer-rc-frozen-1.23.4.123523.zip
  http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-artwork-viewer-rc-frozen-1.23.4.123523.zip
  http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/md5sums-viewer-rc-frozen-1.23.4.123523.txt
Source tarballs - redundant to this svn:
  http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-src-viewer-rc-frozen-1.23.4.123523.tar.gz
  http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-src-viewer-rc-frozen-1.23.4.123523.zip



Property changes on: branches/viewer_1-23_frozen
___________________________________________________________________
Modified: last_good_build
   - 123180
   + 123523

Modified: branches/viewer_1-23_frozen/doc/asset_urls.txt
===================================================================
--- branches/viewer_1-23_frozen/doc/asset_urls.txt	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/doc/asset_urls.txt	2009-06-09 16:44:57 UTC (rev 2371)
@@ -1,5 +1,5 @@
-SLASSET_LIBS_DARWIN=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-dev/slviewer-darwin-libs-viewer-rc-dev-1.23.4.123180.tar.gz
-SLASSET_LIBS_LINUXI386=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-dev/slviewer-linux-libs-viewer-rc-dev-1.23.4.123180.tar.gz
-SLASSET_LIBS_WIN32=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-dev/slviewer-win32-libs-viewer-rc-dev-1.23.4.123180.zip
-SLASSET_ART=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-dev/slviewer-artwork-viewer-rc-dev-1.23.4.123180.zip
-SLASSET_MD5=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-dev/md5sums-viewer-rc-dev-1.23.4.123180.txt
+SLASSET_LIBS_DARWIN=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-darwin-libs-viewer-rc-frozen-1.23.4.123523.tar.gz
+SLASSET_LIBS_LINUXI386=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-linux-libs-viewer-rc-frozen-1.23.4.123523.tar.gz
+SLASSET_LIBS_WIN32=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-win32-libs-viewer-rc-frozen-1.23.4.123523.zip
+SLASSET_ART=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/slviewer-artwork-viewer-rc-frozen-1.23.4.123523.zip
+SLASSET_MD5=http://automated-builds-secondlife-com.s3.amazonaws.com/viewer-rc-frozen/md5sums-viewer-rc-frozen-1.23.4.123523.txt

Modified: branches/viewer_1-23_frozen/indra/llcommon/llversionserver.h
===================================================================
--- branches/viewer_1-23_frozen/indra/llcommon/llversionserver.h	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/llcommon/llversionserver.h	2009-06-09 16:44:57 UTC (rev 2371)
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 27;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 123180;
+const S32 LL_VERSION_BUILD = 123523;
 
 const char * const LL_CHANNEL = "Second Life Server";
 

Modified: branches/viewer_1-23_frozen/indra/llcommon/llversionviewer.h
===================================================================
--- branches/viewer_1-23_frozen/indra/llcommon/llversionviewer.h	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/llcommon/llversionviewer.h	2009-06-09 16:44:57 UTC (rev 2371)
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 23;
 const S32 LL_VERSION_PATCH = 4;
-const S32 LL_VERSION_BUILD = 123180;
+const S32 LL_VERSION_BUILD = 123523;
 
 const char * const LL_CHANNEL = "Second Life Release Candidate";
 

Modified: branches/viewer_1-23_frozen/indra/newview/English.lproj/InfoPlist.strings
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/English.lproj/InfoPlist.strings	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/English.lproj/InfoPlist.strings	2009-06-09 16:44:57 UTC (rev 2371)
@@ -2,6 +2,6 @@
 
 CFBundleName = "Second Life";
 
-CFBundleShortVersionString = "Second Life version 1.23.4.123180";
-CFBundleGetInfoString = "Second Life version 1.23.4.123180, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.23.4.123523";
+CFBundleGetInfoString = "Second Life version 1.23.4.123523, Copyright 2004-2008 Linden Research, Inc.";
 

Modified: branches/viewer_1-23_frozen/indra/newview/Info-SecondLife.plist
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/Info-SecondLife.plist	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/Info-SecondLife.plist	2009-06-09 16:44:57 UTC (rev 2371)
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.23.4.123180</string>
+	<string>1.23.4.123523</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

Modified: branches/viewer_1-23_frozen/indra/newview/llfloatercustomize.cpp
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/llfloatercustomize.cpp	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/llfloatercustomize.cpp	2009-06-09 16:44:57 UTC (rev 2371)
@@ -443,12 +443,6 @@
 {
 	std::for_each(mSubpartList.begin(), mSubpartList.end(), DeletePairedPointer());
 
-	// Clear colorswatch commit callbacks that point to this object.
-	for( std::map<std::string, S32>::iterator iter = mColorList.begin();
-			 iter != mColorList.end(); ++iter )
-	{
-		childSetCommitCallback(iter->first, NULL, NULL);		
-	}
 }
 
 void LLPanelEditWearable::addSubpart( const std::string& name, ESubpart id, LLSubpart* part )
@@ -638,22 +632,18 @@
 	LLColorSwatchCtrl* color_ctrl = (LLColorSwatchCtrl*) ctrl;
 
 	LLVOAvatar* avatar = gAgent.getAvatarObject();
-	if( self && color_ctrl && avatar )
+	if( avatar )
 	{
-		std::map<std::string, S32>::const_iterator cl_itr = self->mColorList.find(ctrl->getName());
-		if(cl_itr != self->mColorList.end())
+		ETextureIndex te = (ETextureIndex)(self->mColorList[ctrl->getName()]);
+
+		LLColor4 old_color = avatar->getClothesColor( te );
+		const LLColor4& new_color = color_ctrl->get();
+		if( old_color != new_color )
 		{
-			ETextureIndex te = (ETextureIndex)cl_itr->second;
+			// Set the new version
+			avatar->setClothesColor( te, new_color, TRUE );
 
-			LLColor4 old_color = avatar->getClothesColor( te );
-			const LLColor4& new_color = color_ctrl->get();
-			if( old_color != new_color )
-			{
-				// Set the new version
-				avatar->setClothesColor( te, new_color, TRUE );
-
-				LLVisualParamHint::requestHintUpdates();
-			}
+			LLVisualParamHint::requestHintUpdates();
 		}
 	}
 }

Modified: branches/viewer_1-23_frozen/indra/newview/llviewerobject.cpp
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/llviewerobject.cpp	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/llviewerobject.cpp	2009-06-09 16:44:57 UTC (rev 2371)
@@ -3779,6 +3779,22 @@
 	return retval;
 }
 
+S32 LLViewerObject::setTEMediaTexGen(const U8 te, const U8 media)
+{
+	S32 retval = 0;
+	const LLTextureEntry *tep = getTE(te);
+	if (!tep)
+	{
+		llwarns << "No texture entry for te " << (S32)te << ", object " << mID << llendl;
+	}
+	else if (media != tep->getMediaTexGen())
+	{
+		retval = LLPrimitive::setTEMediaTexGen(te, media);
+		setChanged(TEXTURE);
+	}
+	return retval;
+}
+
 S32 LLViewerObject::setTEShiny(const U8 te, const U8 shiny)
 {
 	S32 retval = 0;

Modified: branches/viewer_1-23_frozen/indra/newview/llviewerobject.h
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/llviewerobject.h	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/llviewerobject.h	2009-06-09 16:44:57 UTC (rev 2371)
@@ -305,6 +305,7 @@
 	/*virtual*/ S32		setTERotation(const U8 te, const F32 r);
 	/*virtual*/	S32		setTEBumpmap(const U8 te, const U8 bump );
 	/*virtual*/	S32		setTETexGen(const U8 te, const U8 texgen );
+	/*virtual*/	S32		setTEMediaTexGen(const U8 te, const U8 media ); // *FIXME: this confusingly acts upon a superset of setTETexGen's flags without absorbing its semantics
 	/*virtual*/	S32		setTEShiny(const U8 te, const U8 shiny );
 	/*virtual*/	S32		setTEFullbright(const U8 te, const U8 fullbright );
 	/*virtual*/	S32		setTEMediaFlags(const U8 te, const U8 media_flags );

Modified: branches/viewer_1-23_frozen/indra/newview/llvovolume.cpp
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/llvovolume.cpp	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/llvovolume.cpp	2009-06-09 16:44:57 UTC (rev 2371)
@@ -1318,6 +1318,17 @@
 	return  res;
 }
 
+S32 LLVOVolume::setTEMediaTexGen(const U8 te, const U8 media)
+{
+	S32 res = LLViewerObject::setTEMediaTexGen(te, media);
+	if (res)
+	{
+		gPipeline.markTextured(mDrawable);
+		mFaceMappingChanged = TRUE;
+	}
+	return  res;
+}
+
 S32 LLVOVolume::setTEShiny(const U8 te, const U8 shiny)
 {
 	S32 res = LLViewerObject::setTEShiny(te, shiny);

Modified: branches/viewer_1-23_frozen/indra/newview/llvovolume.h
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/llvovolume.h	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/llvovolume.h	2009-06-09 16:44:57 UTC (rev 2371)
@@ -165,6 +165,7 @@
 	/*virtual*/ S32		setTEScaleS(const U8 te, const F32 s);
 	/*virtual*/ S32		setTEScaleT(const U8 te, const F32 t);
 	/*virtual*/ S32		setTETexGen(const U8 te, const U8 texgen);
+	/*virtual*/ S32		setTEMediaTexGen(const U8 te, const U8 media);
 	/*virtual*/ BOOL 	setMaterial(const U8 material);
 
 				void	setTexture(const S32 face);

Modified: branches/viewer_1-23_frozen/indra/newview/res/viewerRes.rc
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/res/viewerRes.rc	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/res/viewerRes.rc	2009-06-09 16:44:57 UTC (rev 2371)
@@ -138,8 +138,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,23,4,123180
- PRODUCTVERSION 1,23,4,123180
+ FILEVERSION 1,23,4,123523
+ PRODUCTVERSION 1,23,4,123523
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.23.4.123180"
+            VALUE "FileVersion", "1.23.4.123523"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.23.4.123180"
+            VALUE "ProductVersion", "1.23.4.123523"
         END
     END
     BLOCK "VarFileInfo"

Modified: branches/viewer_1-23_frozen/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
===================================================================
--- branches/viewer_1-23_frozen/indra/newview/skins/default/xui/en-us/menu_pie_self.xml	2009-06-09 02:54:24 UTC (rev 2370)
+++ branches/viewer_1-23_frozen/indra/newview/skins/default/xui/en-us/menu_pie_self.xml	2009-06-09 16:44:57 UTC (rev 2371)
@@ -3,7 +3,9 @@
 	<menu_item_call enabled="true" label="Profile..." name="Profile...">
 		<on_click function="ShowAgentProfile" userdata="agent" />
 	</menu_item_call>
-	<menu_item_separator />
+	<menu_item_call enabled="true" label="Groups..." name="Groups...">
+		<on_click function="ShowAgentGroups" userdata="agent" />
+	</menu_item_call>
 	<pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
 		<pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
 			<menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"



More information about the sldev-commits mailing list