Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "THE BIGGIE."

Browse Source 
This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
This commit is contained in:
Siana Gearz
2010-10-18 18:27:09 +02:00
parent 49cb86adae
commit 5a67fcd623
48 changed files with 7185 additions and 8544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llinventoryview.cpp
View File

@@ -1950,11 +1950,9 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
<< " for object " << objectp->getName()
<< " (shouldn't happen)" << llendl;
}
else if ((objectp->getType() == LLAssetType::AT_CATEGORY) &&
(objectp->getActualType() != LLAssetType::AT_LINK_FOLDER)) // build new view for category
else if (objectp->getType() == LLAssetType::AT_CATEGORY) // build new view for category
{
LLInvFVBridge* new_listener = LLInvFVBridge::createBridge(objectp->getType(),
objectp->getType(),
LLInventoryType::IT_CATEGORY,
this,
objectp->getUUID());
@@ -1975,7 +1973,6 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
LLInventoryItem* item = (LLInventoryItem*)objectp;
LLInvFVBridge* new_listener = LLInvFVBridge::createBridge(
item->getType(),
item->getActualType(),
item->getInventoryType(),
this,
item->getUUID(),
@@ -2060,7 +2057,6 @@ void LLInventoryPanel::buildNewViews(const LLInventoryObject* objectp)
else if (objectp->getType() == LLAssetType::AT_CATEGORY) // build new view for category
{
LLInvFVBridge* new_listener = LLInvFVBridge::createBridge(objectp->getType(),
objectp->getType(),
LLInventoryType::IT_CATEGORY,
this,
objectp->getUUID());
@@ -2081,10 +2077,9 @@ void LLInventoryPanel::buildNewViews(const LLInventoryObject* objectp)
LLInventoryItem* item = (LLInventoryItem*)objectp;
LLInvFVBridge* new_listener = LLInvFVBridge::createBridge(
item->getType(),
item->getActualType(),
item->getInventoryType(),
this,
item->getUUID(),
item->getInventoryType(),
this,
item->getUUID(),
item->getFlags());
if (new_listener)
{