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

start to add names to the map, inv backup fixes

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-19 20:52:50 -03:00
parent 370c30fd6e
commit 6328987264
2 changed files with 787 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinventorybackup.cpp
View File

@@ -606,7 +606,11 @@ BOOL LLFloaterInventoryBackup::postBuild(void)
status_column["column"] = "status"; status_column["column"] = "status";
status_column["value"] = "Pending"; status_column["value"] = "Pending";
list->addElement(element, ADD_BOTTOM); LLScrollListItem* scroll_itemp = list->addElement(element, ADD_BOTTOM);
//hack to stop crashing
LLScrollListIcon* icon = (LLScrollListIcon*)scroll_itemp->getColumn(LIST_TYPE);
icon->setClickCallback(NULL, NULL);
} }
// Setup and go! // Setup and go!

12
indra/newview/llworldmap.cpp
View File

@@ -37,6 +37,7 @@
#include "llworldmapmessage.h" #include "llworldmapmessage.h"
#include "message.h" #include "message.h"
#include "llappviewer.h" // for gPacificDaylightTime #include "llappviewer.h" // for gPacificDaylightTime
#include "llcachename.h" // for gCacheName
#include "lltracker.h" #include "lltracker.h"
#include "llviewerimage.h" #include "llviewerimage.h"
#include "llviewerimagelist.h" #include "llviewerimagelist.h"
@@ -197,6 +198,7 @@ void LLSimInfo::insertAgentLocation(const LLItemInfo& item)
{ {
std::string name = item.getName(); std::string name = item.getName();
// Find the last item in the list with a different name and erase them // Find the last item in the list with a different name and erase them
item_info_list_t::iterator lastiter; item_info_list_t::iterator lastiter;
for (lastiter = mAgentLocations.begin(); lastiter != mAgentLocations.end(); ++lastiter) for (lastiter = mAgentLocations.begin(); lastiter != mAgentLocations.end(); ++lastiter)
@@ -542,7 +544,15 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
} }
case MAP_ITEM_AGENT_LOCATIONS: // agent locations case MAP_ITEM_AGENT_LOCATIONS: // agent locations
{ {
// LL_INFOS("World Map") << "New Location " << new_item.mName << LL_ENDL; /*
//<edit> yes, we like to know who it is who's there!
std::string avFullName;
gCacheName->getFullName(uuid, avFullName);
LL_INFOS("World Map") << "New Location " << avFullName << LL_ENDL;
//</edit>
*/
if (extra > 0) if (extra > 0)
{ {
new_item.setCount(extra); new_item.setCount(extra);