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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-26 00:36:43 +01:00
parent 9c29488044 98d5e4bea8
commit 38248ac5b3
10 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermenu.cpp
View File

@@ -9475,7 +9475,6 @@ class ListStartIM : public view_listener_t
}
};
/* Singu TODO: Figure out why this wouldn't work
class ListAbuseReport : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9484,7 +9483,6 @@ class ListAbuseReport : public view_listener_t
return true;
}
};
*/
// Create the args for administrative notifications used in lists, tossing the selected names into it.
LLSD create_args(const uuid_vec_t& ids, const std::string& token)
@@ -9899,7 +9897,7 @@ void initialize_menus()
addMenu(new ListStartCall(), "List.StartCall");
addMenu(new ListStartConference(), "List.StartConference");
addMenu(new ListStartIM(), "List.StartIM");
//addMenu(new ListAbuseReport(), "List.AbuseReport");
addMenu(new ListAbuseReport(), "List.AbuseReport");
addMenu(new ListEject(), "List.ParcelEject");
addMenu(new ListFreeze(), "List.Freeze");
addMenu(new ListEstateBan(), "List.EstateBan");