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

set the skeleton hotkey to the wireframe hotkey

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-11 15:51:39 -03:00
parent 0fda17d9fc
commit b0269cef7f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpreviewscript.cpp
View File

@@ -1825,7 +1825,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
LLViewerInventoryItem* item = (LLViewerInventoryItem*)object->getInventoryObject(mItemID); LLViewerInventoryItem* item = (LLViewerInventoryItem*)object->getInventoryObject(mItemID);
if(item if(item
&& (gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE) && (gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE)
|| gAgent.isGodlike())) || gAgent.isGodlike() || gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE)))
{ {
mItem = new LLViewerInventoryItem(item); mItem = new LLViewerInventoryItem(item);
//llinfos << "asset id " << mItem->getAssetUUID() << llendl; //llinfos << "asset id " << mItem->getAssetUUID() << llendl;

5
indra/newview/llviewermenu.cpp
View File

@@ -1352,8 +1352,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
menu->append(new LLMenuItemCallGL("Selected Texture Info", handle_selected_texture_info, NULL, NULL, 'T', MASK_CONTROL|MASK_SHIFT|MASK_ALT)); menu->append(new LLMenuItemCallGL("Selected Texture Info", handle_selected_texture_info, NULL, NULL, 'T', MASK_CONTROL|MASK_SHIFT|MASK_ALT));
//menu->append(new LLMenuItemCallGL("Dump Image List", handle_dump_image_list, NULL, NULL, 'I', MASK_CONTROL|MASK_SHIFT)); //menu->append(new LLMenuItemCallGL("Dump Image List", handle_dump_image_list, NULL, NULL, 'I', MASK_CONTROL|MASK_SHIFT));
menu->append(new LLMenuItemToggleGL("Wireframe", &gUseWireframe, menu->append(new LLMenuItemToggleGL("Wireframe", &gUseWireframe));
'R', MASK_CONTROL|MASK_SHIFT));
LLMenuItemCheckGL* item; LLMenuItemCheckGL* item;
item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT); item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT);
@@ -1455,7 +1454,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
menu->append(new LLMenuItemCheckGL("Show Collision Skeleton", menu->append(new LLMenuItemCheckGL("Show Collision Skeleton",
&LLPipeline::toggleRenderDebug, NULL, &LLPipeline::toggleRenderDebug, NULL,
&LLPipeline::toggleRenderDebugControl, &LLPipeline::toggleRenderDebugControl,
(void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME)); (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME, 'R', MASK_CONTROL|MASK_SHIFT));
menu->append(new LLMenuItemCheckGL("Display Agent Target", menu->append(new LLMenuItemCheckGL("Display Agent Target",
&LLPipeline::toggleRenderDebug, NULL, &LLPipeline::toggleRenderDebug, NULL,
&LLPipeline::toggleRenderDebugControl, &LLPipeline::toggleRenderDebugControl,