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

Minor adjustments

Browse Source
This commit is contained in:
Siana Gearz
2011-04-07 02:17:03 +02:00
parent 753c0b9285
commit 58102daf94
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llstartup.cpp
View File

@@ -1497,7 +1497,7 @@ bool idle_startup()
}
else
{
emsg << "Unable to connect to " << LLAppViewer::instance()->getSecondLifeTitle() << ".\n";
emsg << "Unable to connect to " << gHippoGridManager->getCurrentGrid()->getGridName() << ".\n";
emsg << LLUserAuth::getInstance()->errorMessage();
}
break;

2
indra/newview/llviewerinventory.cpp
View File

@@ -189,9 +189,9 @@ void LLViewerInventoryItem::updateServer(BOOL is_new) const
if(!mIsComplete)
{
// *FIX: deal with this better.
// If we're crashing here then the UI is incorrectly enabled.
llwarns << "LLViewerInventoryItem::updateServer() - for incomplete item"
<< llendl;
LLNotifications::instance().add("IncompleteInventoryItem");
return;
}
LLInventoryModel::LLCategoryUpdate up(mParentUUID, is_new ? 1 : 0);

7
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -5375,6 +5375,13 @@ Unable to load script. Please try again.
The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
</notification>
<notification
icon="notifytip.tga"
name="IncompleteInventoryItem"
type="notifytip">
The item you are accessing is not yet locally available. Please try again in a minute.
</notification>
<notification
icon="notifytip.tga"
name="CannotModifyProtectedCategories"