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

Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh

Browse Source
This commit is contained in:
Lirusaito
2019-07-22 08:52:10 -04:00
parent 3654ff5f5c 1bd6ba61a7
commit b3fcd87a20
7 changed files with 301 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
indra/llwindow/lldxhardware.cpp
View File

@@ -479,79 +479,113 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, S32Megabytes system_ram)
gWriteDebug("No DXDiag provider found! DirectX 9 not installed!\n");
goto LCleanup;
}
if (SUCCEEDED(hr)) // if FAILED(hr) then dx9 is not installed
{
// Fill out a DXDIAG_INIT_PARAMS struct and pass it to IDxDiagContainer::Initialize
// Passing in TRUE for bAllowWHQLChecks, allows dxdiag to check if drivers are
// digital signed as logo'd by WHQL which may connect via internet to update
// WHQL certificates.
DXDIAG_INIT_PARAMS dx_diag_init_params;
ZeroMemory(&dx_diag_init_params, sizeof(DXDIAG_INIT_PARAMS));
if (SUCCEEDED(hr)) // if FAILED(hr) then dx9 is not installed
{
// Fill out a DXDIAG_INIT_PARAMS struct and pass it to IDxDiagContainer::Initialize
// Passing in TRUE for bAllowWHQLChecks, allows dxdiag to check if drivers are
// digital signed as logo'd by WHQL which may connect via internet to update
// WHQL certificates.
DXDIAG_INIT_PARAMS dx_diag_init_params;
ZeroMemory(&dx_diag_init_params, sizeof(DXDIAG_INIT_PARAMS));
dx_diag_init_params.dwSize = sizeof(DXDIAG_INIT_PARAMS);
dx_diag_init_params.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION;
dx_diag_init_params.bAllowWHQLChecks = TRUE;
dx_diag_init_params.pReserved = NULL;
dx_diag_init_params.dwSize = sizeof(DXDIAG_INIT_PARAMS);
dx_diag_init_params.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION;
dx_diag_init_params.bAllowWHQLChecks = TRUE;
dx_diag_init_params.pReserved = NULL;
LL_DEBUGS("AppInit") << "dx_diag_providerp->Initialize" << LL_ENDL;
hr = dx_diag_providerp->Initialize(&dx_diag_init_params);
if(FAILED(hr))
hr = dx_diag_providerp->Initialize(&dx_diag_init_params);
if (FAILED(hr))
{
goto LCleanup;
goto LCleanup;
}
LL_DEBUGS("AppInit") << "dx_diag_providerp->GetRootContainer" << LL_ENDL;
hr = dx_diag_providerp->GetRootContainer( &dx_diag_rootp );
if(FAILED(hr) || !dx_diag_rootp)
hr = dx_diag_providerp->GetRootContainer(&dx_diag_rootp);
if (FAILED(hr) || !dx_diag_rootp)
{
goto LCleanup;
goto LCleanup;
}
// Get display driver information
LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer" << LL_ENDL;
hr = dx_diag_rootp->GetChildContainer(L"DxDiag_DisplayDevices", &devices_containerp);
if(FAILED(hr) || !devices_containerp)
if (FAILED(hr) || !devices_containerp)
{
goto LCleanup;
goto LCleanup;
}
// Get device 0
DWORD device_count;
devices_containerp->GetNumberOfChildContainers(&device_count);
// Get devices
LL_DEBUGS("AppInit") << "devices_containerp->GetChildContainer" << LL_ENDL;
hr = devices_containerp->GetChildContainer(L"0", &device_containerp);
if(FAILED(hr) || !device_containerp)
S32 vram_max = -1;
std::string gpu_string_max;
for (DWORD i = 0; i < device_count; ++i)
{
goto LCleanup;
std::wstring str = L"";
str += std::to_wstring(i);
hr = devices_containerp->GetChildContainer(str.data(), &device_containerp);
if (FAILED(hr) || !device_containerp)
{
continue;
}
DWORD vram = 0;
S32 detected_ram;
std::string ram_str;
WCHAR deviceID[512];
get_wstring(device_containerp, L"szDeviceID", deviceID, 512);
if (SUCCEEDED(GetVideoMemoryViaWMI(deviceID, &vram)))
{
detected_ram = vram / (1024 * 1024);
LL_INFOS("AppInit") << "VRAM for device[" << i << "]: " << detected_ram << " WMI" << LL_ENDL;
}
else
{
// Get the English VRAM string
ram_str = get_string(device_containerp, L"szDisplayMemoryEnglish");
// We don't need the device any more
SAFE_RELEASE(device_containerp);
// Dump the string as an int into the structure
char* stopstring;
detected_ram = strtol(ram_str.c_str(), &stopstring, 10);
detected_ram = llmax(0, detected_ram - ((S32)(system_ram / (2 * device_count)) + 1)); // Ignore shared memory pool.
LL_INFOS("AppInit") << "VRAM for device[" << i << "]: " << detected_ram << " DX9 string: " << ram_str << LL_ENDL;
}
if (detected_ram > vram_max)
{
gpu_string_max = ram_str;
vram_max = detected_ram;
}
}
DWORD vram = 0;
WCHAR deviceID[512];
get_wstring(device_containerp, L"szDeviceID", deviceID, 512);
if (SUCCEEDED(GetVideoMemoryViaWMI(deviceID, &vram)))
if (vram_max <= 0)
{
mVRAM = vram/(1024*1024);
gpu_string_max = "<No sutable gpu device>";
LL_INFOS("AppInit") << "No dedicated VRAM. Using system memory instead." << LL_ENDL;
vram_max = (S32)system_ram / 2; // Integrated graphics perhaps? Use half system ram.
}
else
{ // Get the English VRAM string
std::string ram_str = get_string(device_containerp, L"szDisplayMemoryEnglish");
// We don't need the device any more
SAFE_RELEASE(device_containerp);
LL_INFOS("AppInit") << "VRAM Detected: " << vram_max << " DX9 string: " << gpu_string_max << LL_ENDL;
// Dump the string as an int into the structure
char *stopstring;
mVRAM = strtol(ram_str.c_str(), &stopstring, 10);
mVRAM -= ((S32)system_ram/2) + 1; // Ignore shared memory pool.
if (mVRAM <= 0)
{
LL_INFOS("AppInit") << "No dedicated VRAM. Using system memory instead." << LL_ENDL;
mVRAM = (S32)system_ram / 2; // Integrated graphics perhaps? Use half system ram.
}
LL_INFOS("AppInit") << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;
if (vram_max == -1)
{
goto LCleanup;
}
mVRAM = vram_max;
if (vram_only)
{
ok = TRUE;
@@ -559,15 +593,17 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, S32Megabytes system_ram)
}
/* for now, we ONLY do vram_only the rest of this
is commented out, to ensure no-one is tempted
to use it
// Now let's get device and driver information
// Get the IDxDiagContainer object called "DxDiag_SystemDevices".
// This call may take some time while dxdiag gathers the info.
DWORD num_devices = 0;
WCHAR wszContainer[256];
WCHAR wszContainer[256];
LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer DxDiag_SystemDevices" << LL_ENDL;
hr = dx_diag_rootp->GetChildContainer(L"DxDiag_SystemDevices", &system_device_containerp);
if (FAILED(hr))
@@ -690,7 +726,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, S32Megabytes system_ram)
SAFE_RELEASE(device_containerp);
}
*/
}
}
// dumpDevices();
ok = TRUE;

2
indra/llwindow/llwindowwin32.cpp
View File

@@ -1515,7 +1515,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, co
{ //start at 4.2
WGL_CONTEXT_MAJOR_VERSION_ARB, 4,
WGL_CONTEXT_MINOR_VERSION_ARB, 2,
WGL_CONTEXT_PROFILE_MASK_ARB, LLRender::sGLCoreProfile ? WGL_CONTEXT_CORE_PROFILE_BIT_ARB : WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
WGL_CONTEXT_PROFILE_MASK_ARB, /*LLRender::sGLCoreProfile ? WGL_CONTEXT_CORE_PROFILE_BIT_ARB :*/ WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
WGL_CONTEXT_FLAGS_ARB, gDebugGL ? WGL_CONTEXT_DEBUG_BIT_ARB : 0,
0
};

50
indra/newview/llviewermenu.cpp
View File

@@ -6088,13 +6088,8 @@ class LLAvatarResetSkeleton: public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLVOAvatar* avatar = NULL;
LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (obj)
{
avatar = obj->getAvatar();
}
if(avatar)
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
if (avatar)
{
avatar->resetSkeleton(false);
}
@@ -6102,37 +6097,30 @@ class LLAvatarResetSkeleton: public view_listener_t
}
};
class LLAvatarResetSkeletonAndAnimations : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLVOAvatar* avatar = NULL;
LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (obj)
{
avatar = obj->getAvatar();
}
if(avatar)
{
avatar->resetSkeleton(true);
}
return true;
}
};
class LLAvatarEnableResetSkeleton: public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (obj && obj->getAvatar())
{
return true;
}
return false;
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
return avatar != nullptr;
}
};
class LLAvatarResetSkeletonAndAnimations : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
if (avatar)
{
avatar->resetSkeleton(true);
}
return true;
}
};
bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjectSelectionHandle selection)
{
S32 option = LLNotification::getSelectedOption(notification, response);

55
indra/newview/skins/default/xui/de/menu_pie_attachment.xml
View File

@@ -1,28 +1,39 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<pie_menu name="Attachment Pie">
<menu_item_call label="Profil..." name="Profile..."/>
<menu_item_call label="Drop" name="Drop"/>
<menu_item_call label="Berühren" name="Attachment Object Touch"/>
<menu_item_call label="Aufstehen" name="Stand Up"/>
<menu_item_call label="Abnehmen" name="Detach"/>
<pie_menu label="Werkzeuge" name="Tools">
<pie_menu label="Skripte" name="ScriptsMenu">
<menu_item_call label="Erzeuge Mono" name="CompileMono"/>
<menu_item_call label="Erzeuge LSL" name="CompileLSL"/>
<menu_item_call label="Zurücksetzen" name="Reset Scripts"/>
<menu_item_call label="Start" name="Object Set Scripts to Running"/>
<menu_item_call label="Stop" name="Object Set Scripts to Not Running"/>
<menu_item_call label="Entfernen" name="Remove Scripts From Selection"/>
<menu_item_call label="Zählen" name="ScriptCount"/>
<menu_item_call label="Skript-Info" name="Script Info"/>
</pie_menu>
<menu_item_call label="Untersuchen" name="Object Inspect"/>
<menu_item_call label="Daten" name="Data"/>
<menu_item_call label="Nicht anzeigen" name="Derender"/>
<menu_item_call label="Profil..." name="Profile..."/>
<menu_item_call label="Drop" name="Drop"/>
<menu_item_call label="Berühren" name="Attachment Object Touch"/>
<menu_item_call label="Aufstehen" name="Stand Up"/>
<menu_item_call label="Abnehmen" name="Detach"/>
<pie_menu label="Werkzeuge" name="Tools">
<pie_menu label="Skripte" name="ScriptsMenu">
<menu_item_call label="Erzeuge Mono" name="CompileMono"/>
<menu_item_call label="Erzeuge LSL" name="CompileLSL"/>
<menu_item_call label="Zurücksetzen" name="Reset Scripts"/>
<menu_item_call label="Start" name="Object Set Scripts to Running"/>
<menu_item_call label="Stop" name="Object Set Scripts to Not Running"/>
<menu_item_call label="Entfernen" name="Remove Scripts From Selection"/>
<menu_item_call label="Zählen" name="ScriptCount"/>
<menu_item_call label="Skript-Info" name="Script Info"/>
</pie_menu>
<menu_item_call label="Untersuchen" name="Object Inspect"/>
<menu_item_call label="Daten" name="Data"/>
<menu_item_call label="Nicht anzeigen" name="Derender"/>
<menu_item_call label="Neu laden" name="Reload Textures"/>
<pie_menu label="Avatar" name="Avatar Tools">
<menu_item_call label="Neu laden" name="Reload Textures"/>
<menu_item_call label="Skelett reset" name="Reset Skeleton"/>
<menu_item_call label="Anim. reset" name="Reset Skeleton And Animations"/>
<menu_item_call label="Animationen..." name="Anims..."/>
<menu_item_call label="S. Count" name="ScriptCount"/>
<menu_item_call label="Skript-Info" name="Script Info"/>
<!--menu_item_call label="Debug" name="Debug Layers"/-->
<menu_item_call label="UUID kopieren" name="CopyUUID"/>
<menu_item_call label="Save OBJ..." name="Save OBJ..."/>
</pie_menu>
<menu_item_call label="Save OBJ..." name="Save OBJ..."/>
<menu_item_call label="Save DAE..." name="Save DAE..."/>
</pie_menu>
<menu_item_call label="Aussehen..." name="Appearance..."/>
<menu_item_call label="Bearbeiten..." name="Edit..."/>
</pie_menu>
<menu_item_call label="Aussehen..." name="Appearance..."/>
<menu_item_call label="Bearbeiten..." name="Edit..."/>
</pie_menu>

28
indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
View File

@@ -68,6 +68,34 @@
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Object.ReloadTextures" />
</menu_item_call>
<pie_menu label="Avatar" name="Avatar Tools">
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Avatar.ReloadTextures" />
</menu_item_call>
<menu_item_call enabled="true" label="Reset Skel" mouse_opaque="true" name="Reset Skeleton">
<on_click function="Avatar.ResetSkeleton" />
</menu_item_call>
<menu_item_call enabled="true" label="Reset Anims" mouse_opaque="true" name="Reset Skeleton And Animations">
<on_click function="Avatar.ResetSkeletonAndAnimations" />
</menu_item_call>
<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true" name="Anims...">
<on_click function="ShowFloater" userdata="anims_explorer" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" userdata="agent"/>
<on_visible function="Object.VisibleScriptCount" userdata="agent"/>
</menu_item_call>
<menu_item_call label="Script Info" mouse_opaque="true" name="Script Info">
<on_click function="ShowFloater" userdata="script info" />
<on_visible function="Self.VisibleScriptInfo" />
</menu_item_call>
<menu_item_call enabled="true" label="Copy UUID" mouse_opaque="true" name="CopyUUID">
<on_click function="Avatar.CopyUUID" />
</menu_item_call>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Avatar.SaveAsOBJ" />
</menu_item_call>
</pie_menu>
<menu_item_call label="Save OBJ..." mouse_opaque="true" name="Save OBJ...">
<on_click function="Object.SaveAsOBJ" />
<on_enable function="Object.EnableExport" />

186
indra/newview/skins/default/xui/en-us/menu_pie_self.xml
View File

@@ -1,112 +1,119 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<pie_menu name="Self Pie">
<menu_item_call enabled="true" label="Profile..." name="Profile...">
<on_click function="ShowAgentProfile" userdata="agent" />
</menu_item_call>
<menu_item_call enabled="true" label="Groups..." name="Groups...">
<on_click function="ShowFloater" userdata="groups" />
</menu_item_call>
<pie_menu enabled="true" label="Take Off" name="Take Off">
<pie_menu enabled="true" label="Clothes" name="Clothes">
<menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
<menu_item_call enabled="true" label="Profile..." name="Profile...">
<on_click function="ShowAgentProfile" userdata="agent" />
</menu_item_call>
<menu_item_call enabled="true" label="Groups..." name="Groups...">
<on_click function="ShowFloater" userdata="groups" />
</menu_item_call>
<pie_menu enabled="true" label="Take Off" name="Take Off">
<pie_menu enabled="true" label="Clothes" name="Clothes">
<menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
mouse_opaque="true" name="Shirt" width="118">
<on_click function="Edit.TakeOff" userdata="shirt" />
<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
</menu_item_call>
<menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
<on_click function="Edit.TakeOff" userdata="shirt" />
<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
</menu_item_call>
<menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
mouse_opaque="true" name="Pants" width="118">
<on_click function="Edit.TakeOff" userdata="pants" />
<on_enable function="Edit.EnableTakeOff" userdata="pants" />
</menu_item_call>
<menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
<on_click function="Edit.TakeOff" userdata="pants" />
<on_enable function="Edit.EnableTakeOff" userdata="pants" />
</menu_item_call>
<menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
mouse_opaque="true" name="Shoes" width="118">
<on_click function="Edit.TakeOff" userdata="shoes" />
<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
</menu_item_call>
<menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
<on_click function="Edit.TakeOff" userdata="shoes" />
<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
</menu_item_call>
<menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
mouse_opaque="true" name="Socks" width="118">
<on_click function="Edit.TakeOff" userdata="socks" />
<on_enable function="Edit.EnableTakeOff" userdata="socks" />
</menu_item_call>
<menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
<on_click function="Edit.TakeOff" userdata="socks" />
<on_enable function="Edit.EnableTakeOff" userdata="socks" />
</menu_item_call>
<menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
mouse_opaque="true" name="Jacket" width="118">
<on_click function="Edit.TakeOff" userdata="jacket" />
<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
</menu_item_call>
<menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
<on_click function="Edit.TakeOff" userdata="jacket" />
<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
</menu_item_call>
<menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
mouse_opaque="true" name="Gloves" width="118">
<on_click function="Edit.TakeOff" userdata="gloves" />
<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
</menu_item_call>
<pie_menu more="true" label="More" name="More">
<menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
<on_click function="Edit.TakeOff" userdata="gloves" />
<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
</menu_item_call>
<pie_menu more="true" label="More" name="More">
<menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
mouse_opaque="true" name="Self Undershirt" width="118">
<on_click function="Edit.TakeOff" userdata="undershirt" />
<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
</menu_item_call>
<menu_item_separator />
<menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
<on_click function="Edit.TakeOff" userdata="undershirt" />
<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
</menu_item_call>
<menu_item_separator />
<menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
mouse_opaque="true" name="All Clothes" width="118">
<on_click function="Edit.TakeOff" userdata="all" />
</menu_item_call>
<menu_item_call bottom="-162" enabled="false" height="19" label="Tattoo" left="0"
<on_click function="Edit.TakeOff" userdata="all" />
</menu_item_call>
<menu_item_call bottom="-162" enabled="false" height="19" label="Tattoo" left="0"
mouse_opaque="true" name="Self Tattoo" width="118">
<on_click function="Edit.TakeOff" userdata="tattoo" />
<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
</menu_item_call>
<menu_item_call bottom="-165" enabled="false" height="19" label="Alpha" left="0"
<on_click function="Edit.TakeOff" userdata="tattoo" />
<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
</menu_item_call>
<menu_item_call bottom="-165" enabled="false" height="19" label="Alpha" left="0"
mouse_opaque="true" name="Self Alpha" width="118">
<on_click function="Edit.TakeOff" userdata="alpha" />
<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
</menu_item_call>
<menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
<on_click function="Edit.TakeOff" userdata="alpha" />
<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
</menu_item_call>
<menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
mouse_opaque="true" name="Self Underpants" width="118">
<on_click function="Edit.TakeOff" userdata="underpants" />
<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
</menu_item_call>
<on_click function="Edit.TakeOff" userdata="underpants" />
<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
</menu_item_call>
<menu_item_call bottom="-162" enabled="false" height="19" label="Physics" left="0"
mouse_opaque="true" name="Self Physics" width="118">
<on_click function="Edit.TakeOff" userdata="physics" />
<on_enable function="Edit.EnableTakeOff" userdata="physics" />
</menu_item_call>
</pie_menu>
<menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
</pie_menu>
<menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
mouse_opaque="true" name="Skirt" width="118">
<on_click function="Edit.TakeOff" userdata="skirt" />
<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
</menu_item_call>
</pie_menu>
<pie_menu enabled="true" label="HUD" name="Object Detach HUD" />
<menu_item_separator />
<pie_menu enabled="true" label="Detach" name="Object Detach" />
<pie_menu enabled="true" label="Detach More" name="Object Detach More" />
<menu_item_call enabled="true" label="Detach All" name="Detach All">
<on_click function="Self.RemoveAllAttachments" userdata="" />
<on_enable function="Self.EnableRemoveAllAttachments" />
</menu_item_call>
</pie_menu>
<pie_menu label="Tools" name="Tools">
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Avatar.ReloadTextures" />
<on_click function="Edit.TakeOff" userdata="skirt" />
<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
</menu_item_call>
</pie_menu>
<pie_menu enabled="true" label="HUD" name="Object Detach HUD" />
<menu_item_separator />
<pie_menu enabled="true" label="Detach" name="Object Detach" />
<pie_menu enabled="true" label="Detach More" name="Object Detach More" />
<menu_item_call enabled="true" label="Detach All" name="Detach All">
<on_click function="Self.RemoveAllAttachments" userdata="" />
<on_enable function="Self.EnableRemoveAllAttachments" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="true" label="Stand Up" name="Stand Up Self">
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sit Down,Stand Up"/>
</menu_item_call>
<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
<on_click function="ShowFloater" userdata="gestures" />
</menu_item_call>
<pie_menu label="Tools" name="Tools">
<menu_item_call enabled="true" label="Reload" mouse_opaque="true" name="Reload Textures">
<on_click function="Avatar.ReloadTextures" />
</menu_item_call>
<menu_item_call enabled="true" label="Reset Skel" mouse_opaque="true" name="Reset Skeleton">
<on_click function="Avatar.ResetSkeleton" />
</menu_item_call>
<menu_item_call enabled="true" label="Reset Anims" mouse_opaque="true" name="Reset Skeleton And Animations">
<on_click function="Avatar.ResetSkeletonAndAnimations" />
</menu_item_call>
<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
name="Anims...">
<on_click function="ShowFloater" userdata="anims_explorer" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" userdata="agent"/>
<on_visible function="Object.VisibleScriptCount" userdata="agent"/>
</menu_item_call>
<menu_item_call label="Script Info" mouse_opaque="true" name="Script Info">
<on_click function="ShowFloater" userdata="script info" />
<on_visible function="Self.VisibleScriptInfo" />
</menu_item_call>
<on_click function="ShowFloater" userdata="anims_explorer" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" userdata="agent"/>
<on_visible function="Object.VisibleScriptCount" userdata="agent"/>
</menu_item_call>
<menu_item_call label="Script Info" mouse_opaque="true" name="Script Info">
<on_click function="ShowFloater" userdata="script info" />
<on_visible function="Self.VisibleScriptInfo" />
</menu_item_call>
<!--<menu_item_call enabled="true" label="Debug..." mouse_opaque="true" name="Debug Layers">
<on_click function="Avatar.Debug" />
</menu_item_call>-->
@@ -117,15 +124,8 @@
<on_click function="Avatar.SaveAsOBJ" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="true" label="Stand Up" name="Stand Up Self">
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sit Down,Stand Up"/>
</menu_item_call>
<menu_item_call enabled="true" label="Gestures..." name="Gestures...">
<on_click function="ShowFloater" userdata="gestures" />
</menu_item_call>
<menu_item_call enabled="true" label="Appearance..." name="Appearance...">
<on_click function="ShowFloater" userdata="appearance" />
<on_enable function="Edit.EnableCustomizeAvatar" />
</menu_item_call>
<menu_item_call enabled="true" label="Appearance..." name="Appearance...">
<on_click function="ShowFloater" userdata="appearance" />
<on_enable function="Edit.EnableCustomizeAvatar" />
</menu_item_call>
</pie_menu>

72
indra/newview/skins/default/xui/es/menu_pie_attachment.xml
View File

@@ -1,33 +1,43 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<pie_menu name="Attachment Pie">
<menu_item_call label="Perfil..." name="Profile..."/>
<menu_item_call label="Soltar" name="Drop"/>
<menu_item_call label="Tocar" name="Attachment Object Touch">
<on_click function="Object.Touch" />
<on_enable function="Object.EnableTouch" userdata="Tocar" name="EnableTouch"/>
</menu_item_call>
<menu_item_call label="Pararse" name="Stand Up">
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sentarse,Pararse"/>
</menu_item_call>
<menu_item_call label="Quitar" name="Detach"/>
<pie_menu label="Herramientas" name="Tools">
<pie_menu label="Scripts" name="ScriptsMenu">
<menu_item_call label="Compilar en Mono" name="CompileMono"/>
<menu_item_call label="Compilar en LSL" name="CompileLSL"/>
<menu_item_call label="Reiniciar" name="Reset Scripts"/>
<menu_item_call label="Iniciar" name="Object Set Scripts to Running"/>
<menu_item_call label="Detener" name="Object Set Scripts to Not Running"/>
<menu_item_call label="Borrar" name="Remove Scripts From Selection"/>
<menu_item_call label="Conteo de Scripts" name="ScriptCount"/>
<menu_item_call label="Info de Script" name="Script Info"/>
</pie_menu>
<menu_item_call label="Inspeccionar" name="Object Inspect"/>
<menu_item_call label="Datos" name="Data"/>
<menu_item_call label="Desdibujar" name="Derender"/>
<menu_item_call label="Recargar" name="Reload Textures"/>
<menu_item_call label="Guardar OBJ..." name="Save OBJ..."/>
<menu_item_call label="Guardar DAE..." name="Save DAE..."/>
</pie_menu>
<menu_item_call label="Apariencia..." name="Appearance..."/>
<menu_item_call label="Editar..." name="Edit..."/></pie_menu>
<menu_item_call label="Perfil..." name="Profile..."/>
<menu_item_call label="Soltar" name="Drop"/>
<menu_item_call label="Tocar" name="Attachment Object Touch">
<on_click function="Object.Touch" />
<on_enable function="Object.EnableTouch" userdata="Tocar" name="EnableTouch"/>
</menu_item_call>
<menu_item_call label="Pararse" name="Stand Up">
<on_click function="Self.SitOrStand"/>
<on_enable function="Self.EnableSitOrStand" userdata="Sentarse,Pararse"/>
</menu_item_call>
<menu_item_call label="Quitar" name="Detach"/>
<pie_menu label="Herramientas" name="Tools">
<pie_menu label="Scripts" name="ScriptsMenu">
<menu_item_call label="Compilar en Mono" name="CompileMono"/>
<menu_item_call label="Compilar en LSL" name="CompileLSL"/>
<menu_item_call label="Reiniciar" name="Reset Scripts"/>
<menu_item_call label="Iniciar" name="Object Set Scripts to Running"/>
<menu_item_call label="Detener" name="Object Set Scripts to Not Running"/>
<menu_item_call label="Borrar" name="Remove Scripts From Selection"/>
<menu_item_call label="Conteo de Scripts" name="ScriptCount"/>
<menu_item_call label="Info de Script" name="Script Info"/>
</pie_menu>
<menu_item_call label="Inspeccionar" name="Object Inspect"/>
<menu_item_call label="Datos" name="Data"/>
<menu_item_call label="Desdibujar" name="Derender"/>
<menu_item_call label="Recargar" name="Reload Textures"/>
<pie_menu label="Avatar" name="Avatar Tools">
<menu_item_call label="Recargar" name="Reload Textures"/>
<menu_item_call label="Animaciones..." name="Anims..."/>
<menu_item_call label="Contar Scripts" name="ScriptCount"/>
<menu_item_call label="Info de Script" name="Script Info"/>
<menu_item_call label="Depurar..." name="Debug Layers"/>
<menu_item_call label="Copiar UUID" name="CopyUUID"/>
<menu_item_call label="Guardar OBJ..." name="Save OBJ..."/>
</pie_menu>
<menu_item_call label="Guardar OBJ..." name="Save OBJ..."/>
<menu_item_call label="Guardar DAE..." name="Save DAE..."/>
</pie_menu>
<menu_item_call label="Apariencia..." name="Appearance..."/>
<menu_item_call label="Editar..." name="Edit..."/>
</pie_menu>