[sldev-commits] r1639 - in branches/maint-viewer: doc indra/llcommon indra/llmessage indra/llrender 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 Jan 6 18:18:01 PST 2009


Author: cg.linden
Date: 2009-01-06 20:18:01 -0600 (Tue, 06 Jan 2009)
New Revision: 1639

Modified:
   branches/maint-viewer/doc/asset_urls.txt
   branches/maint-viewer/indra/llcommon/llerror.cpp
   branches/maint-viewer/indra/llcommon/llerrorlegacy.h
   branches/maint-viewer/indra/llcommon/llstat.cpp
   branches/maint-viewer/indra/llcommon/llstat.h
   branches/maint-viewer/indra/llcommon/llversionserver.h
   branches/maint-viewer/indra/llcommon/llversionviewer.h
   branches/maint-viewer/indra/llmessage/llcachename.cpp
   branches/maint-viewer/indra/llmessage/llcircuit.cpp
   branches/maint-viewer/indra/llmessage/lldatapacker.cpp
   branches/maint-viewer/indra/llrender/llrender.cpp
   branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings
   branches/maint-viewer/indra/newview/Info-SecondLife.plist
   branches/maint-viewer/indra/newview/lldrawable.cpp
   branches/maint-viewer/indra/newview/llfloaterimagepreview.cpp
   branches/maint-viewer/indra/newview/llfloatersnapshot.cpp
   branches/maint-viewer/indra/newview/llimpanel.cpp
   branches/maint-viewer/indra/newview/llpanelavatar.cpp
   branches/maint-viewer/indra/newview/llpanelface.cpp
   branches/maint-viewer/indra/newview/res/viewerRes.rc
   branches/maint-viewer/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
Trac: http://svn.secondlife.com/trac/linden/changeset/1639
Log:
Snapshot of internal branch maint-viewer
Internal URL: http://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-12
Revision Range: 107230 to 107230

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


Modified: branches/maint-viewer/doc/asset_urls.txt
===================================================================
--- branches/maint-viewer/doc/asset_urls.txt	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/doc/asset_urls.txt	2009-01-07 02:18:01 UTC (rev 1639)
@@ -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.107213.tar.gz
-SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.107213.tar.gz
-SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.107213.zip
-SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.107213.zip
-SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.107213.txt
+SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-darwin-libs-maint-viewer-1.22.0.107230.tar.gz
+SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.107230.tar.gz
+SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.107230.zip
+SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.107230.zip
+SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.107230.txt

Modified: branches/maint-viewer/indra/llcommon/llerror.cpp
===================================================================
--- branches/maint-viewer/indra/llcommon/llerror.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llcommon/llerror.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -1150,14 +1150,17 @@
 	void crashAndLoop(const std::string& message)
 	{
 		// Now, we go kaboom!
-		int* crash = NULL;
+		int* make_me_crash = NULL;
 
-		*crash = 0;
+		*make_me_crash = 0;
 
 		while(true)
 		{
 			// Loop forever, in case the crash didn't work?
 		}
+		
+		// this is an attempt to let Coverity and other semantic scanners know that this function won't be returning ever.
+		exit(EXIT_FAILURE);
 	}
 
 	std::string utcTime()

Modified: branches/maint-viewer/indra/llcommon/llerrorlegacy.h
===================================================================
--- branches/maint-viewer/indra/llcommon/llerrorlegacy.h	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llcommon/llerrorlegacy.h	2009-01-07 02:18:01 UTC (rev 1639)
@@ -101,17 +101,14 @@
 
 #define llwarning(msg, num)		llwarns << "Warning # " << num << ": " << msg << llendl;
 
-#ifdef SHOW_ASSERT
-#define llassert(func)			if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
-#else
-#define llassert(func)
-#endif
 #define llassert_always(func)	if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
 
 #ifdef SHOW_ASSERT
-#define llverify(func)			if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
+#define llassert(func)			llassert_always(func)
+#define llverify(func)			llassert_always(func)
 #else
-#define llverify(func)			(func); // get rid of warning C4189
+#define llassert(func)
+#define llverify(func)			do {if (func) {}} while(0)
 #endif
 
 // handy compile-time assert - enforce those template parameters! 

Modified: branches/maint-viewer/indra/llcommon/llstat.cpp
===================================================================
--- branches/maint-viewer/indra/llcommon/llstat.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llcommon/llstat.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -326,6 +326,7 @@
 LLStatAccum::LLStatAccum(bool useFrameTimer)
 	: mUseFrameTimer(useFrameTimer),
 	  mRunning(FALSE),
+	  mLastTime(0),
 	  mLastSampleValue(0.0),
 	  mLastSampleValid(FALSE)
 {
@@ -346,7 +347,7 @@
 	{
 		mBuckets[i].accum = 0.0;
 		mBuckets[i].endTime = when + sScaleTimes[i];
-		mBuckets[i].lastValid = FALSE;
+		mBuckets[i].lastValid = false;
 	}
 }
 
@@ -394,7 +395,7 @@
 			{
 				F64 valueLeft = value * timeLeft / timeSpan;
 
-				bucket.lastValid = TRUE;
+				bucket.lastValid = true;
 				bucket.lastAccum = bucket.accum + (value - valueLeft);
 				bucket.accum = valueLeft;
 				bucket.endTime += timeScale;
@@ -403,7 +404,7 @@
 			{
 				U64 timeTail = timeLeft % timeScale;
 
-				bucket.lastValid = TRUE;
+				bucket.lastValid = true;
 				bucket.lastAccum = value * timeScale / timeSpan;
 				bucket.accum = value * timeTail / timeSpan;
 				bucket.endTime += (timeLeft - timeTail) + timeScale;

Modified: branches/maint-viewer/indra/llcommon/llstat.h
===================================================================
--- branches/maint-viewer/indra/llcommon/llstat.h	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llcommon/llstat.h	2009-01-07 02:18:01 UTC (rev 1639)
@@ -95,11 +95,18 @@
 	
 	struct Bucket
 	{
-		F64		accum;
-		U64		endTime;
+		Bucket() :
+			accum(0.0),
+			endTime(0),
+			lastValid(false),
+			lastAccum(0.0)
+		{}
 
-		BOOL	lastValid;
-		F64		lastAccum;
+		F64	accum;
+		U64	endTime;
+
+		bool	lastValid;
+		F64	lastAccum;
 	};
 
 	Bucket	mBuckets[NUM_SCALES];

Modified: branches/maint-viewer/indra/llcommon/llversionserver.h
===================================================================
--- branches/maint-viewer/indra/llcommon/llversionserver.h	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llcommon/llversionserver.h	2009-01-07 02:18:01 UTC (rev 1639)
@@ -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 = 107213;
+const S32 LL_VERSION_BUILD = 107230;
 
 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-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llcommon/llversionviewer.h	2009-01-07 02:18:01 UTC (rev 1639)
@@ -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 = 107213;
+const S32 LL_VERSION_BUILD = 107230;
 
 const char * const LL_CHANNEL = "Second Life Release";
 

Modified: branches/maint-viewer/indra/llmessage/llcachename.cpp
===================================================================
--- branches/maint-viewer/indra/llmessage/llcachename.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llmessage/llcachename.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -361,21 +361,16 @@
 	{
 		entry = new LLCacheNameEntry;
 		impl.mCache[id] = entry;
-		
 	}
 	entry->mIsGroup = false;
 	entry->mCreateTime = (U32)LLFrameTimer::getTotalSeconds();
-    //entry->mFirstName = first;
-    //entry->mLastName = last;
-    //LLStringUtil::truncate(entry->mFirstName, DB_FIRST_NAME_BUF_SIZE);
-    //LLStringUtil::truncate(entry->mLastName, DB_LAST_NAME_BUF_SIZE);
-    entry->mFirstName = std::string(first, DB_FIRST_NAME_BUF_SIZE);
-    entry->mLastName = std::string(last, DB_LAST_NAME_BUF_SIZE);
+	entry->mFirstName = std::string(first, DB_FIRST_NAME_BUF_SIZE);
+	entry->mLastName = std::string(last, DB_LAST_NAME_BUF_SIZE);
 
 	impl.mPendingQueue.erase(id);
 	impl.notifyObservers(id,
-				entry->mFirstName, entry->mLastName,
-				FALSE);
+			     entry->mFirstName, entry->mLastName,
+			     FALSE);
 	 
 }
 
@@ -383,17 +378,16 @@
 {
 	 
 	LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id);
-    if (!entry)
+	if (!entry)
 	{
 		entry = new LLCacheNameEntry;
 		impl.mCache[id] = entry;
-								     
 	}
 	     
 	entry->mIsGroup = true;
 	entry->mCreateTime = (U32)time(NULL);
 	
-    entry->mGroupName = std::string(name, DB_GROUP_NAME_BUF_SIZE);
+	entry->mGroupName = std::string(name, DB_GROUP_NAME_BUF_SIZE);
 
 	impl.mPendingQueue.erase(id);
 		     
@@ -510,6 +504,7 @@
 		entry->mFirstName = agent[FIRST].asString();
 		entry->mLastName = agent[LAST].asString();
 		impl.mCache[id] = entry;
+
 		++count;
 	}
 	llinfos << "LLCacheName loaded " << count << " agent names" << llendl;
@@ -695,15 +690,9 @@
 	{
 		id.set((*iter).first);
 		LLSD name = (*iter).second;
-		LLCacheNameEntry* entry = new LLCacheNameEntry;
-		entry->mIsGroup = FALSE;
-		entry->mCreateTime = (U32)LLFrameTimer::getTotalSeconds();
-        std::string first = name["first"];
-        std::string last = name["last"];
-        entry->mFirstName = std::string(first, DB_FIRST_NAME_BUF_SIZE);
-        entry->mLastName = std::string(last, DB_LAST_NAME_BUF_SIZE);
-
-		gCacheName->sendAgentNames(id,first,last);
+		std::string first = name["first"];
+		std::string last = name["last"];
+		gCacheName->sendAgentNames(id,first,last); // also creates local name cache entry if necessary
 	}	
 }
 
@@ -746,15 +735,10 @@
 	LLSD::map_const_iterator iter = content.beginMap();
 	for ( ; iter != content.endMap(); ++iter)
 	{
-					  
 		id.set((*iter).first);
 		std::string name = (*iter).second.asString();
-		LLCacheNameEntry* entry = new LLCacheNameEntry;
-		entry->mIsGroup = TRUE;						
-		entry->mCreateTime = (U32)time(NULL);
-        entry->mGroupName = std::string(name, DB_GROUP_NAME_BUF_SIZE);
 		lldebugs<<"Group Name"<<name<<llendl;
-		gCacheName->sendGroupNames(id,name);							
+		gCacheName->sendGroupNames(id,name); // also creates local name cache entry if necessary
 	}
 }
 

Modified: branches/maint-viewer/indra/llmessage/llcircuit.cpp
===================================================================
--- branches/maint-viewer/indra/llmessage/llcircuit.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llmessage/llcircuit.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -76,6 +76,8 @@
 	mPacketsOutID(0), 
 	mPacketsInID(in_id),
 	mHighestPacketID(in_id),
+	mTimeoutCallback(NULL),
+	mTimeoutUserData(NULL),
 	mTrusted(FALSE),
 	mbAllowTimeout(TRUE),
 	mbAlive(TRUE),
@@ -101,11 +103,12 @@
 	mBytesOutLastPeriod(0),
 	mBytesInThisPeriod(0),
 	mBytesOutThisPeriod(0),
-	mPeakBPSIn(0),
-	mPeakBPSOut(0),
+	mPeakBPSIn(0.f),
+	mPeakBPSOut(0.f),
 	mPeriodTime(0.0),
 	mExistenceTimer(),
-	mCurrentResendCount(0)
+	mCurrentResendCount(0),
+	mLastPacketGap(0)
 {
 	// Need to guarantee that this time is up to date, we may be creating a circuit even though we haven't been
 	//  running a message system loop.
@@ -118,9 +121,6 @@
 	mNextPingSendTime = mLastPingSendTime + 0.95*PING_INTERVAL + ll_frand(0.1f*PING_INTERVAL);
 	mPeriodTime = mt_sec;
 
-	mTimeoutCallback = NULL;
-	mTimeoutUserData = NULL;
-
 	mLocalEndPointID.generate();
 }
 

Modified: branches/maint-viewer/indra/llmessage/lldatapacker.cpp
===================================================================
--- branches/maint-viewer/indra/llmessage/lldatapacker.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llmessage/lldatapacker.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -1895,7 +1895,12 @@
 	if (mFP)
 	{
 		fpos_t last_pos;
-		fgetpos(mFP, &last_pos);
+		if (0 != fgetpos(mFP, &last_pos)) // 0==success for fgetpos
+		{
+			llwarns << "Data packer failed to fgetpos" << llendl;
+			return FALSE;
+		}
+
 		if (fgets(buffer, DP_BUFSIZE, mFP) == NULL)
 		{
 			buffer[0] = '\0';

Modified: branches/maint-viewer/indra/llrender/llrender.cpp
===================================================================
--- branches/maint-viewer/indra/llrender/llrender.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/llrender/llrender.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -747,7 +747,7 @@
 
 LLTexUnit* LLRender::getTexUnit(U32 index)
 {
-	if ((index >= 0) && (index < mTexUnits.size()))
+	if (index < mTexUnits.size())
 	{
 		return mTexUnits[index];
 	}

Modified: branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings
===================================================================
--- branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings	2009-01-07 02:18:01 UTC (rev 1639)
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.22.0.107213";
-CFBundleGetInfoString = "Second Life version 1.22.0.107213, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.22.0.107230";
+CFBundleGetInfoString = "Second Life version 1.22.0.107230, 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-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/Info-SecondLife.plist	2009-01-07 02:18:01 UTC (rev 1639)
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.22.0.107213</string>
+	<string>1.22.0.107230</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

Modified: branches/maint-viewer/indra/newview/lldrawable.cpp
===================================================================
--- branches/maint-viewer/indra/newview/lldrawable.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/lldrawable.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -1006,6 +1006,10 @@
 	mPartitionType = LLViewerRegion::PARTITION_VOLUME;
 	
 	mOctree->balance();
+
+	llassert(mDrawable);
+	llassert(mDrawable->getRegion());
+	llassert(mDrawable->getRegion()->getSpatialPartition(mPartitionType));
 	
 	mDrawable->getRegion()->getSpatialPartition(mPartitionType)->put(this);
 }
@@ -1306,6 +1310,10 @@
 
 BOOL LLSpatialBridge::updateMove()
 {
+	llassert(mDrawable);
+	llassert(mDrawable->getRegion());
+	llassert(mDrawable->getRegion()->getSpatialPartition(mPartitionType));
+
 	mOctree->balance();
 	mDrawable->getRegion()->getSpatialPartition(mPartitionType)->move(this, getSpatialGroup(), TRUE);
 	return TRUE;

Modified: branches/maint-viewer/indra/newview/llfloaterimagepreview.cpp
===================================================================
--- branches/maint-viewer/indra/newview/llfloaterimagepreview.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/llfloaterimagepreview.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -71,11 +71,14 @@
 // LLFloaterImagePreview()
 //-----------------------------------------------------------------------------
 LLFloaterImagePreview::LLFloaterImagePreview(const std::string& filename) : 
-	LLFloaterNameDesc(filename)
+	LLFloaterNameDesc(filename),
+
+	mAvatarPreview(NULL),
+	mSculptedPreview(NULL),
+	mLastMouseX(0),
+	mLastMouseY(0),
+	mGLName(0)
 {
-	mLastMouseX = 0;
-	mLastMouseY = 0;
-	mGLName = 0;
 	loadImage(mFilenameAndPath);
 }
 

Modified: branches/maint-viewer/indra/newview/llfloatersnapshot.cpp
===================================================================
--- branches/maint-viewer/indra/newview/llfloatersnapshot.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/llfloatersnapshot.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -1243,7 +1243,7 @@
 
 	LLSnapshotLivePreview* previewp = getPreviewView(floater);
 	BOOL got_bytes = previewp && previewp->getDataSize() > 0;
-	BOOL got_snap = previewp->getSnapshotUpToDate();
+	BOOL got_snap = previewp && previewp->getSnapshotUpToDate();
 
 	floater->childSetEnabled("send_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_bytes && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
 	floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE  && got_bytes && got_snap);
@@ -1251,7 +1251,10 @@
 
 	LLLocale locale(LLLocale::USER_LOCALE);
 	std::string bytes_string;
-	LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
+	if (got_snap)
+	{
+		LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
+	}
 	floater->childSetTextArg("file_size_label", "[SIZE]", got_snap ? bytes_string : got_bytes ? floater->getString("unknown") : std::string("???"));
 	floater->childSetColor("file_size_label", 
 		shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD 

Modified: branches/maint-viewer/indra/newview/llimpanel.cpp
===================================================================
--- branches/maint-viewer/indra/newview/llimpanel.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/llimpanel.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -1988,8 +1988,8 @@
 
 		LLViewerStats::getInstance()->incStat(LLViewerStats::ST_IM_COUNT);
 
+		mInputEditor->setText(LLStringUtil::null);
 	}
-	mInputEditor->setText(LLStringUtil::null);
 
 	// Don't need to actually send the typing stop message, the other
 	// client will infer it from receiving the message.

Modified: branches/maint-viewer/indra/newview/llpanelavatar.cpp
===================================================================
--- branches/maint-viewer/indra/newview/llpanelavatar.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/llpanelavatar.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -541,8 +541,6 @@
 void LLPanelAvatarWeb::enableControls(BOOL self)
 {	
 	childSetEnabled("url_edit",self);
-	childSetVisible("status_text",!self && !mHome.empty());
-	childSetText("status_text", LLStringUtil::null);
 }
 
 void LLPanelAvatarWeb::setWebURL(std::string url)
@@ -566,11 +564,8 @@
 	else
 	{
 		childSetVisible("profile_html",false);
+		childSetVisible("status_text", false);
 	}
-
-	BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
-	childSetVisible("status_text",!own_avatar && !mHome.empty());
-	
 }
 
 // static
@@ -593,13 +588,16 @@
 {
 	bool have_url = (!url.empty());
 
+	
+	childSetVisible("profile_html", have_url);
+	childSetVisible("status_text", have_url);
+	childSetText("status_text", LLStringUtil::null);
+
 	if (have_url)
 	{
 		llinfos << "Loading " << url << llendl;
 		mWebBrowser->navigateTo( url );
 	}
-
-	childSetVisible("profile_html", have_url);
 }
 
 //static

Modified: branches/maint-viewer/indra/newview/llpanelface.cpp
===================================================================
--- branches/maint-viewer/indra/newview/llpanelface.cpp	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/llpanelface.cpp	2009-01-07 02:18:01 UTC (rev 1639)
@@ -72,7 +72,6 @@
 	LLTextureCtrl*	mTextureCtrl;
 	LLColorSwatchCtrl*	mColorSwatch;
 
-	LLTextBox*		mLabelTexGen;
 	LLComboBox*		mComboTexGen;
 
 	LLCheckBoxCtrl	*mCheckFullbright;
@@ -80,7 +79,6 @@
 	LLTextBox*		mLabelColorTransp;
 	LLSpinCtrl*		mCtrlColorTransp;		// transparency = 1 - alpha
 
-	LLTextBox*      mLabelGlow;
 	LLSpinCtrl*     mCtrlGlow;
 
 	setMouseOpaque(FALSE);
@@ -151,7 +149,7 @@
 		mCheckFullbright->setCommitCallback(LLPanelFace::onCommitFullbright);
 		mCheckFullbright->setCallbackUserData( this );
 	}
-	mLabelTexGen = getChild<LLTextBox>("tex gen");
+
 	mComboTexGen = getChild<LLComboBox>("combobox texgen");
 	if(mComboTexGen)
 	{
@@ -160,7 +158,6 @@
 		mComboTexGen->setCallbackUserData( this );
 	}
 
-	mLabelGlow = getChild<LLTextBox>("glow label");
 	mCtrlGlow = getChild<LLSpinCtrl>("glow");
 	if(mCtrlGlow)
 	{

Modified: branches/maint-viewer/indra/newview/res/viewerRes.rc
===================================================================
--- branches/maint-viewer/indra/newview/res/viewerRes.rc	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/res/viewerRes.rc	2009-01-07 02:18:01 UTC (rev 1639)
@@ -138,8 +138,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,22,0,107213
- PRODUCTVERSION 1,22,0,107213
+ FILEVERSION 1,22,0,107230
+ PRODUCTVERSION 1,22,0,107230
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.22.0.107213"
+            VALUE "FileVersion", "1.22.0.107230"
             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.107213"
+            VALUE "ProductVersion", "1.22.0.107230"
         END
     END
     BLOCK "VarFileInfo"

Modified: branches/maint-viewer/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
===================================================================
--- branches/maint-viewer/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml	2009-01-06 23:09:41 UTC (rev 1638)
+++ branches/maint-viewer/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml	2009-01-07 02:18:01 UTC (rev 1639)
@@ -2,7 +2,8 @@
 <floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" enabled="true" follows="left|top" height="361" left="273"
      min_height="243" min_width="234" mouse_opaque="true"
-     name="preview notecard" title="Note:" width="400">
+     name="preview notecard" title="Note:" width="400"
+     default_tab_group="1">
 	<button bottom="-352" enabled="false" follows="left|bottom" font="SansSerif"
 	     halign="center" height="20" label="Save" label_selected="Save" left="9"
 	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
@@ -23,7 +24,7 @@
 	<text_editor type="string" length="1" bottom="-327" embedded_items="true" enabled="true"
 	     follows="left|top|right|bottom" font="SansSerif" height="281"
 	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-	     name="Notecard Editor" width="392" word_wrap="true">
+	     name="Notecard Editor" width="392" word_wrap="true" tab_group="1">
 		Loading...
 	</text_editor>
 	<string name="no_object">



More information about the sldev-commits mailing list