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

Rip out the globals :D

Browse Source
This commit is contained in:
Drake Arconis
2013-06-18 01:03:27 -04:00
parent 7a0e3d8abd
commit 43a7cbaa85
6 changed files with 41 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llappviewer.cpp
View File

@@ -263,12 +263,6 @@ LLTimer gLogoutTimer;
static const F32 LOGOUT_REQUEST_TIME = 6.f; // this will be cut short by the LogoutReply msg. static const F32 LOGOUT_REQUEST_TIME = 6.f; // this will be cut short by the LogoutReply msg.
F32 gLogoutMaxTime = LOGOUT_REQUEST_TIME; F32 gLogoutMaxTime = LOGOUT_REQUEST_TIME;
// <edit>
LLUUID gSystemFolderRoot;
LLUUID gSystemFolderSettings;
LLUUID gSystemFolderAssets;
// </edit>
BOOL gDisconnected = FALSE; BOOL gDisconnected = FALSE;
// used to restore texture state after a mode switch // used to restore texture state after a mode switch

6
indra/newview/llappviewer.h
View File

@@ -321,12 +321,6 @@ extern LLTimer gLogoutTimer;
extern F32 gSimLastTime; extern F32 gSimLastTime;
extern F32 gSimFrames; extern F32 gSimFrames;
// <edit>
extern LLUUID gSystemFolderRoot;
extern LLUUID gSystemFolderSettings;
extern LLUUID gSystemFolderAssets;
// </edit>
extern BOOL gDisconnected; extern BOOL gDisconnected;
extern LLFrameTimer gRestoreGLTimer; extern LLFrameTimer gRestoreGLTimer;

130
indra/newview/llinventorybridge.cpp
View File

@@ -88,8 +88,6 @@
#include "rlvlocks.h" #include "rlvlocks.h"
// [/RLVa:KB] // [/RLVa:KB]
extern LLUUID gSystemFolderRoot;
// Marketplace outbox current disabled // Marketplace outbox current disabled
#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1 #define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1
#define ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU 1 #define ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU 1
@@ -385,33 +383,26 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
move_ids.push_back(item->getUUID()); move_ids.push_back(item->getUUID());
--update[item->getParentUUID()]; --update[item->getParentUUID()];
++update[trash_id]; ++update[trash_id];
// <edit> if(start_new_message)
if(!gInventory.isObjectDescendentOf(item->getUUID(), gSystemFolderRoot))
{ {
// </edit> start_new_message = false;
if(start_new_message) msg->newMessageFast(_PREHASH_MoveInventoryItem);
{ msg->nextBlockFast(_PREHASH_AgentData);
start_new_message = false; msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->newMessageFast(_PREHASH_MoveInventoryItem); msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_AgentData); msg->addBOOLFast(_PREHASH_Stamp, TRUE);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); }
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); msg->nextBlockFast(_PREHASH_InventoryData);
msg->addBOOLFast(_PREHASH_Stamp, TRUE); msg->addUUIDFast(_PREHASH_ItemID, item->getUUID());
} msg->addUUIDFast(_PREHASH_FolderID, trash_id);
msg->nextBlockFast(_PREHASH_InventoryData); msg->addString("NewName", NULL);
msg->addUUIDFast(_PREHASH_ItemID, item->getUUID()); if(msg->isSendFullFast(_PREHASH_InventoryData))
msg->addUUIDFast(_PREHASH_FolderID, trash_id); {
msg->addString("NewName", NULL); start_new_message = true;
if(msg->isSendFullFast(_PREHASH_InventoryData)) gAgent.sendReliableMessage();
{ gInventory.accountForUpdate(update);
start_new_message = true; update.clear();
gAgent.sendReliableMessage();
gInventory.accountForUpdate(update);
update.clear();
}
// <edit>
} }
// </edit>
} }
} }
if(!start_new_message) if(!start_new_message)
@@ -433,32 +424,25 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
move_ids.push_back(cat->getUUID()); move_ids.push_back(cat->getUUID());
--update[cat->getParentUUID()]; --update[cat->getParentUUID()];
++update[trash_id]; ++update[trash_id];
// <edit> if(start_new_message)
if(!gInventory.isObjectDescendentOf(cat->getUUID(), gSystemFolderRoot)) //Avoid fake items.
{ {
// </edit> start_new_message = false;
if(start_new_message) msg->newMessageFast(_PREHASH_MoveInventoryFolder);
{ msg->nextBlockFast(_PREHASH_AgentData);
start_new_message = false; msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->newMessageFast(_PREHASH_MoveInventoryFolder); msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_AgentData); msg->addBOOL("Stamp", TRUE);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); }
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); msg->nextBlockFast(_PREHASH_InventoryData);
msg->addBOOL("Stamp", TRUE); msg->addUUIDFast(_PREHASH_FolderID, cat->getUUID());
} msg->addUUIDFast(_PREHASH_ParentID, trash_id);
msg->nextBlockFast(_PREHASH_InventoryData); if(msg->isSendFullFast(_PREHASH_InventoryData))
msg->addUUIDFast(_PREHASH_FolderID, cat->getUUID()); {
msg->addUUIDFast(_PREHASH_ParentID, trash_id); start_new_message = true;
if(msg->isSendFullFast(_PREHASH_InventoryData)) gAgent.sendReliableMessage();
{ gInventory.accountForUpdate(update);
start_new_message = true; update.clear();
gAgent.sendReliableMessage();
gInventory.accountForUpdate(update);
update.clear();
}
// <edit>
} }
// </edit>
} }
} }
if(!start_new_message) if(!start_new_message)
@@ -472,37 +456,6 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
uuid_vec_t::iterator end = move_ids.end(); uuid_vec_t::iterator end = move_ids.end();
for(; it != end; ++it) for(; it != end; ++it)
{ {
// <edit> trash problem
if(gInventory.isObjectDescendentOf(*it, gSystemFolderRoot))
{
// if it's a category, delete descendents
if(gInventory.getCategory(*it))
{
LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
cat->setDescendentCount(0);
LLInventoryModel::cat_array_t categories;
LLInventoryModel::item_array_t items;
gInventory.collectDescendents(cat->getUUID(),
categories,
items,
false); // include trash?
S32 count = items.count();
S32 i;
for(i = 0; i < count; ++i)
{
gInventory.deleteObject(items.get(i)->getUUID());
}
count = categories.count();
for(i = 0; i < count; ++i)
{
gInventory.deleteObject(categories.get(i)->getUUID());
}
}
// delete it
gInventory.deleteObject(*it);
}
else
// </edit>
gInventory.moveObject((*it), trash_id); gInventory.moveObject((*it), trash_id);
} }
@@ -1520,9 +1473,6 @@ void LLItemBridge::selectItem()
LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem()); LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem());
if(item && !item->isFinished()) if(item && !item->isFinished())
{ {
// <edit>
if(!(gInventory.isObjectDescendentOf(mUUID, gSystemFolderRoot)))
// </edit>
//item->fetchFromServer(); //item->fetchFromServer();
LLInventoryModelBackgroundFetch::instance().start(item->getUUID(), false); LLInventoryModelBackgroundFetch::instance().start(item->getUUID(), false);
} }
@@ -1794,16 +1744,6 @@ BOOL LLItemBridge::removeItem()
// Already in trash // Already in trash
if (model->isObjectDescendentOf(mUUID, trash_id)) return FALSE; if (model->isObjectDescendentOf(mUUID, trash_id)) return FALSE;
// <edit> trash problem
if(gInventory.isObjectDescendentOf(mUUID, gSystemFolderRoot))
{
LLInventoryModel::LLCategoryUpdate up(item->getParentUUID(), -1);
gInventory.deleteObject(mUUID);
gInventory.accountForUpdate(up);
gInventory.notifyObservers();
}
// </edit>
LLNotification::Params params("ConfirmItemDeleteHasLinks"); LLNotification::Params params("ConfirmItemDeleteHasLinks");
params.functor(boost::bind(&LLItemBridge::confirmRemoveItem, this, _1, _2)); params.functor(boost::bind(&LLItemBridge::confirmRemoveItem, this, _1, _2));

4
indra/newview/llinventorymodel.cpp
View File

@@ -1777,10 +1777,6 @@ bool LLInventoryModel::isCategoryComplete(const LLUUID& cat_id) const
} }
} }
// <edit>
if((cat_id == gSystemFolderRoot) || gInventory.isObjectDescendentOf(cat_id, gSystemFolderRoot)) return true;
// </edit>
return false; return false;
} }

14
indra/newview/lltooldraganddrop.cpp
View File

@@ -1512,10 +1512,9 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL
if(!item || !obj) return ACCEPT_NO; if(!item || !obj) return ACCEPT_NO;
// HACK: downcast // HACK: downcast
LLViewerInventoryItem* vitem = (LLViewerInventoryItem*)item; LLViewerInventoryItem* vitem = (LLViewerInventoryItem*)item;
// <edit>
//if(!vitem->isFinished()) return ACCEPT_NO; if(!vitem->isFinished()) return ACCEPT_NO;
if(!vitem->isFinished() && !(gInventory.isObjectDescendentOf(vitem->getUUID(), gSystemFolderRoot))) return ACCEPT_NO;
// </edit>
if (vitem->getIsLinkType()) return ACCEPT_NO; // No giving away links if (vitem->getIsLinkType()) return ACCEPT_NO; // No giving away links
// deny attempts to drop from an object onto itself. This is to // deny attempts to drop from an object onto itself. This is to
@@ -1980,10 +1979,9 @@ EAcceptance LLToolDragAndDrop::dad3dApplyToObject(
LLViewerInventoryItem* item; LLViewerInventoryItem* item;
LLViewerInventoryCategory* cat; LLViewerInventoryCategory* cat;
locateInventory(item, cat); locateInventory(item, cat);
// <edit>
//if(!item || !item->isFinished()) return ACCEPT_NO; if(!item || !item->isFinished()) return ACCEPT_NO;
if( !item || (!item->isFinished() && !(gInventory.isObjectDescendentOf(item->getUUID(), gSystemFolderRoot))) ) return ACCEPT_NO;
// </edit>
EAcceptance rv = willObjectAcceptInventory(obj, item); EAcceptance rv = willObjectAcceptInventory(obj, item);
if((mask & MASK_CONTROL)) if((mask & MASK_CONTROL))
{ {

15
indra/newview/llviewerinventory.cpp
View File

@@ -293,9 +293,6 @@ void LLViewerInventoryItem::cloneViewerItem(LLPointer<LLViewerInventoryItem>& ne
void LLViewerInventoryItem::removeFromServer() void LLViewerInventoryItem::removeFromServer()
{ {
// <edit> this check is ghetto
if((mParentUUID == gSystemFolderRoot) || (gInventory.isObjectDescendentOf(mUUID, gSystemFolderRoot))) return;
// </edit>
lldebugs << "Removing inventory item " << mUUID << " from server." lldebugs << "Removing inventory item " << mUUID << " from server."
<< llendl; << llendl;
@@ -314,9 +311,6 @@ void LLViewerInventoryItem::removeFromServer()
void LLViewerInventoryItem::updateServer(BOOL is_new) const void LLViewerInventoryItem::updateServer(BOOL is_new) const
{ {
// <edit>
if((mParentUUID == gSystemFolderRoot) || (gInventory.isObjectDescendentOf(mUUID, gSystemFolderRoot))) return;
// </edit>
if(!mIsComplete) if(!mIsComplete)
{ {
// *FIX: deal with this better. // *FIX: deal with this better.
@@ -492,9 +486,6 @@ bool LLViewerInventoryItem::exportFileLocal(LLFILE* fp) const
void LLViewerInventoryItem::updateParentOnServer(BOOL restamp) const void LLViewerInventoryItem::updateParentOnServer(BOOL restamp) const
{ {
// <edit>
if(gInventory.isObjectDescendentOf(mUUID, gSystemFolderRoot)) return;
// </edit>
LLMessageSystem* msg = gMessageSystem; LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_MoveInventoryItem); msg->newMessageFast(_PREHASH_MoveInventoryItem);
msg->nextBlockFast(_PREHASH_AgentData); msg->nextBlockFast(_PREHASH_AgentData);
@@ -564,9 +555,6 @@ void LLViewerInventoryCategory::copyViewerCategory(const LLViewerInventoryCatego
void LLViewerInventoryCategory::updateParentOnServer(BOOL restamp) const void LLViewerInventoryCategory::updateParentOnServer(BOOL restamp) const
{ {
// <edit>
if(gInventory.isObjectDescendentOf(mUUID, gSystemFolderRoot)) return;
// </edit>
LLMessageSystem* msg = gMessageSystem; LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_MoveInventoryFolder); msg->newMessageFast(_PREHASH_MoveInventoryFolder);
msg->nextBlockFast(_PREHASH_AgentData); msg->nextBlockFast(_PREHASH_AgentData);
@@ -631,9 +619,6 @@ void LLViewerInventoryCategory::removeFromServer( void )
bool LLViewerInventoryCategory::fetch() bool LLViewerInventoryCategory::fetch()
{ {
// <edit>
if((mUUID == gSystemFolderRoot) || (gInventory.isObjectDescendentOf(mUUID, gSystemFolderRoot))) return false;
// </edit>
if((VERSION_UNKNOWN == getVersion()) && if((VERSION_UNKNOWN == getVersion()) &&
(!mDescendentsRequested.getStarted() || (!mDescendentsRequested.getStarted() ||
mDescendentsRequested.hasExpired())) //Expired check prevents multiple downloads. mDescendentsRequested.hasExpired())) //Expired check prevents multiple downloads.