[sldev-commits] r1690 - in branches/featurettes: doc indra/llcommon indra/newview indra/newview/English.lproj indra/newview/res indra/newview/skins/silver/xui/en-us

cg.linden at svn.secondlife.com cg.linden at svn.secondlife.com
Thu Jan 15 21:33:08 PST 2009


Author: cg.linden
Date: 2009-01-15 23:33:08 -0600 (Thu, 15 Jan 2009)
New Revision: 1690

Modified:
   branches/featurettes/doc/asset_urls.txt
   branches/featurettes/indra/llcommon/llversionserver.h
   branches/featurettes/indra/llcommon/llversionviewer.h
   branches/featurettes/indra/newview/English.lproj/InfoPlist.strings
   branches/featurettes/indra/newview/Info-SecondLife.plist
   branches/featurettes/indra/newview/llimpanel.cpp
   branches/featurettes/indra/newview/llpanelavatar.cpp
   branches/featurettes/indra/newview/lltooldraganddrop.cpp
   branches/featurettes/indra/newview/lltooldraganddrop.h
   branches/featurettes/indra/newview/res/viewerRes.rc
   branches/featurettes/indra/newview/skins/silver/xui/en-us/floater_tools.xml
Trac: http://svn.secondlife.com/trac/linden/changeset/1690
Log:
Snapshot of internal branch featurettes
Internal URL: http://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-9
Revision Range: 108035 to 108035

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


Modified: branches/featurettes/doc/asset_urls.txt
===================================================================
--- branches/featurettes/doc/asset_urls.txt	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/doc/asset_urls.txt	2009-01-16 05:33:08 UTC (rev 1690)
@@ -1,5 +1,5 @@
-SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-darwin-libs-featurettes-1.22.0.107374.tar.gz
-SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-linux-libs-featurettes-1.22.0.107374.tar.gz
-SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-win32-libs-featurettes-1.22.0.107374.zip
-SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-artwork-featurettes-1.22.0.107374.zip
-SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/md5sums-featurettes-1.22.0.107374.txt
+SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-darwin-libs-featurettes-1.22.0.108035.tar.gz
+SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-linux-libs-featurettes-1.22.0.108035.tar.gz
+SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-win32-libs-featurettes-1.22.0.108035.zip
+SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/slviewer-artwork-featurettes-1.22.0.108035.zip
+SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/featurettes/md5sums-featurettes-1.22.0.108035.txt

Modified: branches/featurettes/indra/llcommon/llversionserver.h
===================================================================
--- branches/featurettes/indra/llcommon/llversionserver.h	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/llcommon/llversionserver.h	2009-01-16 05:33:08 UTC (rev 1690)
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 26;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 107374;
+const S32 LL_VERSION_BUILD = 108035;
 
 const char * const LL_CHANNEL = "Second Life Server";
 

Modified: branches/featurettes/indra/llcommon/llversionviewer.h
===================================================================
--- branches/featurettes/indra/llcommon/llversionviewer.h	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/llcommon/llversionviewer.h	2009-01-16 05:33:08 UTC (rev 1690)
@@ -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 = 107374;
+const S32 LL_VERSION_BUILD = 108035;
 
 const char * const LL_CHANNEL = "Second Life Release";
 

Modified: branches/featurettes/indra/newview/English.lproj/InfoPlist.strings
===================================================================
--- branches/featurettes/indra/newview/English.lproj/InfoPlist.strings	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/English.lproj/InfoPlist.strings	2009-01-16 05:33:08 UTC (rev 1690)
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.22.0.107374";
-CFBundleGetInfoString = "Second Life version 1.22.0.107374, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.22.0.108035";
+CFBundleGetInfoString = "Second Life version 1.22.0.108035, Copyright 2004-2008 Linden Research, Inc.";
 

Modified: branches/featurettes/indra/newview/Info-SecondLife.plist
===================================================================
--- branches/featurettes/indra/newview/Info-SecondLife.plist	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/Info-SecondLife.plist	2009-01-16 05:33:08 UTC (rev 1690)
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.22.0.107374</string>
+	<string>1.22.0.108035</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

Modified: branches/featurettes/indra/newview/llimpanel.cpp
===================================================================
--- branches/featurettes/indra/newview/llimpanel.cpp	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/llimpanel.cpp	2009-01-16 05:33:08 UTC (rev 1690)
@@ -1607,61 +1607,33 @@
 								  EAcceptance* accept,
 								  std::string& tooltip_msg)
 {
-	BOOL accepted = FALSE;
-	switch(cargo_type)
+
+	if (mDialog == IM_NOTHING_SPECIAL)
 	{
-		case DAD_CALLINGCARD:
+		LLToolDragAndDrop::handleGiveDragAndDrop(mOtherParticipantUUID, mSessionUUID, drop,
+												 cargo_type, cargo_data, accept);
+	}
+	
+	// handle case for dropping calling cards (and folders of calling cards) onto invitation panel for invites
+	else if (isInviteAllowed())
+	{
+		*accept = ACCEPT_NO;
+		
+		if (cargo_type == DAD_CALLINGCARD)
 		{
-			accepted = dropCallingCard((LLInventoryItem*)cargo_data, drop);
-			break;
+			if (dropCallingCard((LLInventoryItem*)cargo_data, drop))
+			{
+				*accept = ACCEPT_YES_MULTI;
+			}
 		}
-		case DAD_CATEGORY:
+		else if (cargo_type == DAD_CATEGORY)
 		{
-			accepted = dropCategory((LLInventoryCategory*)cargo_data, drop);
-			break;
-		}
-
-		// See stdenums.h
-		case DAD_TEXTURE:
-		case DAD_SOUND:
-		// DAD_CALLINGCARD above
-		case DAD_LANDMARK:
-		case DAD_SCRIPT:
-		case DAD_CLOTHING:
-		case DAD_OBJECT:
-		case DAD_NOTECARD:
-		// DAD_CATEGORY above
-		case DAD_BODYPART:
-		case DAD_ANIMATION:
-		case DAD_GESTURE:
-		{
-			if (mDialog == IM_NOTHING_SPECIAL)
+			if (dropCategory((LLInventoryCategory*)cargo_data, drop))
 			{
-				// See LLDropTarget for similar code.
-				LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
-				if(gInventory.getItem(inv_item->getUUID())
-				   && LLToolDragAndDrop::isInventoryGiveAcceptable(inv_item))
-				{
-					accepted = true;
-					if(drop)
-					{
-						LLToolDragAndDrop::giveInventory(mOtherParticipantUUID, inv_item, mSessionUUID);
-					}
-				}
+				*accept = ACCEPT_YES_MULTI;
 			}
-			break;
 		}
-	default:
-		break;
 	}
-	if (accepted)
-	{
-		*accept = ACCEPT_YES_MULTI;
-	}
-	else
-	{
-		*accept = ACCEPT_NO;
-	}
 	return TRUE;
 } 
 

Modified: branches/featurettes/indra/newview/llpanelavatar.cpp
===================================================================
--- branches/featurettes/indra/newview/llpanelavatar.cpp	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/llpanelavatar.cpp	2009-01-16 05:33:08 UTC (rev 1690)
@@ -140,79 +140,15 @@
 									 EAcceptance* accept,
 									 std::string& tooltip_msg)
 {
-	BOOL handled = FALSE;
 	if(getParent())
 	{
-		// check if inside
-		//LLRect parent_rect = mParentView->getRect();
-		//getRect().set(0, parent_rect.getHeight(), parent_rect.getWidth(), 0);
-		handled = TRUE;
+		LLToolDragAndDrop::handleGiveDragAndDrop(mAgentID, LLUUID::null, drop,
+												 cargo_type, cargo_data, accept);
 
-		// check the type
-		switch(cargo_type)
-		{
-		case DAD_TEXTURE:
-		case DAD_SOUND:
-		case DAD_LANDMARK:
-		case DAD_SCRIPT:
-		case DAD_OBJECT:
-		case DAD_NOTECARD:
-		case DAD_CLOTHING:
-		case DAD_BODYPART:
-		case DAD_ANIMATION:
-		case DAD_GESTURE:
-		{
-			LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
-			if(gInventory.getItem(inv_item->getUUID())
-				&& LLToolDragAndDrop::isInventoryGiveAcceptable(inv_item))
-			{
-				// *TODO: get multiple object transfers working
-				*accept = ACCEPT_YES_COPY_SINGLE;
-				if(drop)
-				{
-					LLToolDragAndDrop::giveInventory(mAgentID, inv_item);
-				}
-			}
-			else
-			{
-				// It's not in the user's inventory (it's probably
-				// in an object's contents), so disallow dragging
-				// it here.  You can't give something you don't
-				// yet have.
-				*accept = ACCEPT_NO;
-			}
-			break;
-		}
-		case DAD_CATEGORY:
-		{
-			LLViewerInventoryCategory* inv_cat = (LLViewerInventoryCategory*)cargo_data;
-			if( gInventory.getCategory( inv_cat->getUUID() ) )
-			{
-				// *TODO: get multiple object transfers working
-				*accept = ACCEPT_YES_COPY_SINGLE;
-				if(drop)
-				{
-					LLToolDragAndDrop::giveInventoryCategory(mAgentID,
-																inv_cat);
-				}
-			}
-			else
-			{
-				// It's not in the user's inventory (it's probably
-				// in an object's contents), so disallow dragging
-				// it here.  You can't give something you don't
-				// yet have.
-				*accept = ACCEPT_NO;
-			}
-			break;
-		}
-		case DAD_CALLINGCARD:
-		default:
-			*accept = ACCEPT_NO;
-			break;
-		}
+		return TRUE;
 	}
-	return handled;
+
+	return FALSE;
 }
 
 

Modified: branches/featurettes/indra/newview/lltooldraganddrop.cpp
===================================================================
--- branches/featurettes/indra/newview/lltooldraganddrop.cpp	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/lltooldraganddrop.cpp	2009-01-16 05:33:08 UTC (rev 1690)
@@ -1549,7 +1549,7 @@
 // static
 void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
 												LLInventoryItem* item,
-												const LLUUID &im_session_id)
+												const LLUUID& im_session_id)
 {
 	if(!item) return;
 	std::string name;
@@ -1599,7 +1599,9 @@
 }
 
 void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
-											  LLInventoryCategory* cat)
+											  LLInventoryCategory* cat,
+											  const LLUUID& im_session_id)
+
 {
 	if(!cat) return;
 	llinfos << "LLToolDragAndDrop::giveInventoryCategory() - "
@@ -1650,12 +1652,12 @@
 	{
 		if(0 == giveable.countNoCopy())
 		{
-			LLToolDragAndDrop::commitGiveInventoryCategory(to_agent, cat);
+			LLToolDragAndDrop::commitGiveInventoryCategory(to_agent, cat, im_session_id);
 		}
 		else 
 		{
 			LLGiveInventoryInfo* info = NULL;
-			info = new LLGiveInventoryInfo(to_agent, cat->getUUID());
+			info = new LLGiveInventoryInfo(to_agent, cat->getUUID(), im_session_id);
 			LLStringUtil::format_map_t args;
 			args["[COUNT]"] = llformat("%d",giveable.countNoCopy());
 			gViewerWindow->alertXml("CannotCopyCountItems", args,
@@ -1709,7 +1711,9 @@
 
 // static
 void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
-													LLInventoryCategory* cat)
+													LLInventoryCategory* cat,
+													const LLUUID& im_session_id)
+
 {
 	if(!cat) return;
 	llinfos << "LLToolDragAndDrop::commitGiveInventoryCategory() - "
@@ -1800,6 +1804,13 @@
 		gFloaterTools->dirty();
 
 		LLMuteList::getInstance()->autoRemove(to_agent, LLMuteList::AR_INVENTORY);
+
+		// If this item was given by drag-and-drop into an IM panel, log this action in the IM panel chat.
+		if (im_session_id != LLUUID::null)
+		{
+			LLStringUtil::format_map_t args;
+			gIMMgr->addSystemMessage(im_session_id, "inventory_item_offered", args);
+		}
 	}
 }
 
@@ -1960,6 +1971,82 @@
 	return ACCEPT_NO;
 }
 
+
+// function used as drag-and-drop handler for simple agent give inventory requests
+//static
+bool LLToolDragAndDrop::handleGiveDragAndDrop(LLUUID dest_agent, LLUUID session_id, BOOL drop,
+											  EDragAndDropType cargo_type,
+											  void* cargo_data,
+											  EAcceptance* accept)
+{
+	// check the type
+	switch(cargo_type)
+	{
+	case DAD_TEXTURE:
+	case DAD_SOUND:
+	case DAD_LANDMARK:
+	case DAD_SCRIPT:
+	case DAD_OBJECT:
+	case DAD_NOTECARD:
+	case DAD_CLOTHING:
+	case DAD_BODYPART:
+	case DAD_ANIMATION:
+	case DAD_GESTURE:
+	{
+		LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
+		if(gInventory.getItem(inv_item->getUUID())
+		   && LLToolDragAndDrop::isInventoryGiveAcceptable(inv_item))
+		{
+			// *TODO: get multiple object transfers working
+			*accept = ACCEPT_YES_COPY_SINGLE;
+			if(drop)
+			{
+				LLToolDragAndDrop::giveInventory(dest_agent, inv_item, session_id);
+			}
+		}
+		else
+		{
+			// It's not in the user's inventory (it's probably
+			// in an object's contents), so disallow dragging
+			// it here.  You can't give something you don't
+			// yet have.
+			*accept = ACCEPT_NO;
+		}
+		break;
+	}
+	case DAD_CATEGORY:
+	{
+		LLViewerInventoryCategory* inv_cat = (LLViewerInventoryCategory*)cargo_data;
+		if( gInventory.getCategory( inv_cat->getUUID() ) )
+		{
+			// *TODO: get multiple object transfers working
+			*accept = ACCEPT_YES_COPY_SINGLE;
+			if(drop)
+			{
+				LLToolDragAndDrop::giveInventoryCategory(dest_agent, inv_cat, session_id);
+			}
+		}
+		else
+		{
+			// It's not in the user's inventory (it's probably
+			// in an object's contents), so disallow dragging
+			// it here.  You can't give something you don't
+			// yet have.
+			*accept = ACCEPT_NO;
+		}
+		break;
+	}
+	case DAD_CALLINGCARD:
+	default:
+		*accept = ACCEPT_NO;
+		break;
+	}
+
+	return TRUE;
+}
+
+
+
 ///
 /// Methods called in the drag & drop array
 ///

Modified: branches/featurettes/indra/newview/lltooldraganddrop.h
===================================================================
--- branches/featurettes/indra/newview/lltooldraganddrop.h	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/lltooldraganddrop.h	2009-01-16 05:33:08 UTC (rev 1690)
@@ -217,7 +217,9 @@
 	// give inventory category functionality
 	static void handleCopyProtectedCategory(S32 option, void* data);
 	static void commitGiveInventoryCategory(const LLUUID& to_agent,
-						LLInventoryCategory* cat);
+											LLInventoryCategory* cat,
+											const LLUUID &im_session_id = LLUUID::null);
+
 public:
 	// helper functions
 	static BOOL isInventoryDropAcceptable(LLViewerObject* obj, LLInventoryItem* item) { return (ACCEPT_YES_COPY_SINGLE <= willObjectAcceptInventory(obj, item)); }
@@ -256,7 +258,13 @@
 							  LLInventoryItem* item,
 							  const LLUUID &session_id = LLUUID::null);
 	static void giveInventoryCategory(const LLUUID& to_agent,
-									  LLInventoryCategory* item);
+									  LLInventoryCategory* item,
+									  const LLUUID &session_id = LLUUID::null);
+
+	static bool handleGiveDragAndDrop(LLUUID agent, LLUUID session, BOOL drop,
+									  EDragAndDropType cargo_type,
+									  void* cargo_data,
+									  EAcceptance* accept);
 };
 
 // utility functions

Modified: branches/featurettes/indra/newview/res/viewerRes.rc
===================================================================
--- branches/featurettes/indra/newview/res/viewerRes.rc	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/res/viewerRes.rc	2009-01-16 05:33:08 UTC (rev 1690)
@@ -231,8 +231,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,22,0,107374
- PRODUCTVERSION 1,22,0,107374
+ FILEVERSION 1,22,0,108035
+ PRODUCTVERSION 1,22,0,108035
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -249,12 +249,12 @@
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.22.0.107374"
+            VALUE "FileVersion", "1.22.0.108035"
             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.107374"
+            VALUE "ProductVersion", "1.22.0.108035"
         END
     END
     BLOCK "VarFileInfo"

Modified: branches/featurettes/indra/newview/skins/silver/xui/en-us/floater_tools.xml
===================================================================
--- branches/featurettes/indra/newview/skins/silver/xui/en-us/floater_tools.xml	2009-01-15 03:26:39 UTC (rev 1689)
+++ branches/featurettes/indra/newview/skins/silver/xui/en-us/floater_tools.xml	2009-01-16 05:33:08 UTC (rev 1690)
@@ -283,7 +283,7 @@
 	          Size
 	</text>
 	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
-         increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
+         increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
 	     mouse_opaque="true" name="slider brush size" width="80" />	
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
 	     border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"



More information about the sldev-commits mailing list