Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Well, everything's fixed except for the goddamn asset downloader.

  • Loading branch information...
commit 6a8a61a9a1a2a46930422492b7cdac433bb39760 1 parent 8ebf78a
Rob Nelson N3X15 authored
Showing with 10,033 additions and 2,972 deletions.
  1. +82 −38 indra/newview/LuaInventory_f.cpp
  2. +3 −0  indra/newview/LunaLua.cpp
  3. +142 −72 indra/newview/_LuaSL.cpp
  4. +4 −4 indra/newview/a_phoenixviewerlink.cpp
  5. +2 −2 indra/newview/a_phoenixviewerlink.h
  6. +54 −0 indra/newview/app_settings/settings.xml
  7. +11 −0 indra/newview/app_settings/settings_per_account.xml
  8. +77 −0 indra/newview/character/avatar_lad.xml
  9. +12 −0 indra/newview/floaterao.cpp
  10. +3 −3 indra/newview/growlmanager.cpp
  11. +18 −18 indra/newview/llagent.cpp
  12. +2 −2 indra/newview/llagent.h
  13. +75 −42 indra/newview/llselectmgr.cpp
  14. +1 −1  indra/newview/llvieweraudio.cpp
  15. +4 −0 indra/newview/llviewermenu.cpp
  16. +23 −31 indra/newview/llviewertexteditor.cpp
  17. +1 −1  indra/newview/llviewertexteditor.h
  18. +21 −21 indra/newview/llvoavatar.cpp
  19. +1 −1  indra/newview/llvoavatar.h
  20. +10 −10 indra/newview/lua/HookDocs.lua
  21. +2 −1  indra/newview/lua/Hooks/AO/ZHAOParser.lua
  22. +5 −2 indra/newview/lua/Hooks/AO/_init_.lua
  23. BIN  indra/newview/skins/default/textures/Inv_WaterLight.png
  24. BIN  indra/newview/skins/default/textures/Inv_WindLight.png
  25. BIN  indra/newview/skins/default/textures/arrow_left.tga
  26. BIN  indra/newview/skins/default/textures/arrow_right.tga
  27. +6 −1 indra/newview/skins/default/textures/textures.xml
  28. +7 −7 indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
  29. +11 −11 indra/newview/skins/default/xui/en-us/floater_alertwindow.xml
  30. +3 −6 indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
  31. +322 −100 indra/newview/skins/default/xui/en-us/floater_ao.xml
  32. +2 −2 indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
  33. +137 −0 indra/newview/skins/default/xui/en-us/floater_avatar_scanner.xml
  34. +13 −13 indra/newview/skins/default/xui/en-us/floater_avatar_textures.xml
  35. +8 −8 indra/newview/skins/default/xui/en-us/floater_build_options.xml
  36. +17 −27 indra/newview/skins/default/xui/en-us/floater_color_picker.xml
  37. +5 −19 indra/newview/skins/default/xui/en-us/floater_customize.xml
  38. +4 −4 indra/newview/skins/default/xui/en-us/floater_explore_animations.xml
  39. +1 −1  indra/newview/skins/default/xui/en-us/floater_html.xml
  40. +1 −1  indra/newview/skins/default/xui/en-us/floater_image_preview.xml
  41. +2 −2 indra/newview/skins/default/xui/en-us/floater_inspect.xml
  42. +3 −1 indra/newview/skins/default/xui/en-us/floater_instant_message.xml
  43. +4 −4 indra/newview/skins/default/xui/en-us/floater_inventory.xml
  44. +260 −0 indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
  45. +180 −0 indra/newview/skins/default/xui/en-us/floater_media_player.xml
  46. +11 −0 indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml
  47. +119 −0 indra/newview/skins/default/xui/en-us/floater_script_ed_panel_adv.xml
  48. +40 −0 indra/newview/skins/default/xui/en-us/floater_search_replace.xml
  49. +50 −0 indra/newview/skins/default/xui/en-us/floater_searcharea.xml
  50. +1 −1  indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
  51. +3 −2 indra/newview/skins/default/xui/en-us/floater_snapshot.xml
  52. +6 −2 indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
  53. +52 −29 indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
  54. +46 −14 indra/newview/skins/default/xui/en-us/floater_tools.xml
  55. +1 −1  indra/newview/skins/default/xui/en-us/floater_url_entry.xml
  56. +22 −9 indra/newview/skins/default/xui/en-us/floater_water.xml
  57. +25 −12 indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
  58. +2 −7 indra/newview/skins/default/xui/en-us/floater_world_map.xml
  59. +9 −0 indra/newview/skins/default/xui/en-us/menu_inventory.xml
  60. +4 −10 indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
  61. +26 −31 indra/newview/skins/default/xui/en-us/menu_pie_object.xml
  62. +18 −36 indra/newview/skins/default/xui/en-us/menu_pie_self.xml
  63. +383 −633 indra/newview/skins/default/xui/en-us/menu_viewer.xml
  64. +52 −19 indra/newview/skins/default/xui/en-us/mime_types_linux.xml
  65. +7,266 −1,468 indra/newview/skins/default/xui/en-us/notifications.xml
  66. +1 −1  indra/newview/skins/default/xui/en-us/panel_audio.xml
  67. +6 −18 indra/newview/skins/default/xui/en-us/panel_avatar.xml
  68. +1 −1  indra/newview/skins/default/xui/en-us/panel_group_general.xml
  69. +3 −3 indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
  70. +23 −23 indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
  71. +7 −7 indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
  72. +5 −6 indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
  73. +2 −2 indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
  74. +1 −1  indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
  75. +1 −1  indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
  76. +158 −157 indra/newview/skins/default/xui/en-us/panel_preferences_phoenix.xml
  77. +3 −7 indra/newview/skins/default/xui/en-us/panel_toolbar.xml
  78. +1 −1  indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
  79. +11 −2 indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
  80. +1 −1  indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings.xml
  81. +32 −5 indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
  82. +1 −1  indra/newview/skins/default/xui/es/floater_about.xml
  83. +1 −1  indra/newview/skins/default/xui/es/menu_viewer.xml
  84. +8 −2 indra/newview/skins/default/xui/es/notifications.xml
  85. +1 −1  indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
  86. +2 −0  indra/newview/swig/SL.swig
  87. +86 −0 scripts/GetHooks.py
  88. +3 −1 scripts/automated_build_scripts/update_settings.bat
120 indra/newview/LuaInventory_f.cpp
View
@@ -18,6 +18,7 @@
#include <boost/tokenizer.hpp>
+void requestInventoryAsset_Event(LLUUID reqID,LLUUID task_id,LLUUID item_id);
void giveInventoryItem_Event(LLUUID to_agent, LLUUID item_id, LLUUID im_session_id);
LLUUID TraverseCategories(const std::string& target_cat, LLViewerInventoryCategory *ccat=NULL, int i=0);
void Lua_onAssetDownloaded(LLVFS *vfs,const LLUUID& asset_uuid,LLAssetType::EType type,void* user_data, S32 status, LLExtStat ext_status);
@@ -102,6 +103,7 @@ LLUUID getInventoryItemUUID(const std::string& name, int type)
LLUUID getInventoryAssetUUID(const std::string& name, int type)
{
+ llinfos << "getInventoryAssetUUID("<< name <<","<< type <<")" << llendl;
LLViewerInventoryCategory::cat_array_t cats;
LLViewerInventoryItem::item_array_t items;
LunaFindItemByName byn(name,(LLAssetType::EType)type);
@@ -114,6 +116,7 @@ LLUUID getInventoryAssetUUID(const std::string& name, int type)
std::string getInventoryItemName(LLUUID key, int type)
{
+ llinfos << "getInventoryItemName("<< key <<","<< type <<")" << llendl;
LLInventoryItem *item = gInventory.getItem(key);
if(!item)
{
@@ -205,56 +208,23 @@ void giveInventoryItem(LLUUID to_agent, LLUUID item_id, LLUUID im_session_id)
CB_Args3<LLUUID,LLUUID,LLUUID>(giveInventoryItem_Event,to_agent,item_id,im_session_id);
}
-LLUUID requestInventoryAsset(LLUUID item_id,LLUUID task_id)
-{
- LLUUID new_item_id=LLUUID::generateNewID();
- LLViewerInventoryItem *item = gInventory.getItem(item_id);
- if(!item)
- {
- LuaError(llformat("Could not find item %s.",item_id.asString()).c_str());
- return LLUUID::null;
- }
-
- if (!gAgent.allowOperation(PERM_COPY, item->getPermissions(),GP_OBJECT_MANIPULATE) && gAgent.isGodlike())
- {
- LuaError(llformat("You do not have copy permission on %s %s.",
- LLAssetType::lookupHumanReadable(item->getActualType()),
- item->getName()).c_str());
- return LLUUID::null;
- }
- LLHost source_sim = LLHost::invalid;
- LLUUID invfolderid = item->getParentUUID();
- gAssetStorage->getInvItemAsset(source_sim,
- gAgent.getID(),
- gAgent.getSessionID(),
- item->getPermissions().getOwner(),
- LLUUID::null,
- item->getUUID(),
- item->getAssetUUID(),
- item->getType(),
- &Lua_onAssetDownloaded,
- (void*)new LLUUID(new_item_id),
- TRUE);
- return new_item_id;
-}
-
-
void Lua_onAssetDownloaded(LLVFS *vfs,const LLUUID& asset_uuid,LLAssetType::EType type,void* user_data, S32 status, LLExtStat ext_status)
{
// Pointer juggling. Yay.
LLUUID req_key = *((LLUUID*)user_data);
if(status == LL_ERR_NOERR)
{
+ llinfos << "requestInventoryAsset(): Asset received" << llendl;
S32 size = vfs->getSize(asset_uuid, type);
U8* buffer = new U8[size];
vfs->getData(asset_uuid, type, buffer, 0, size);
+ LLViewerTextEditor* edit = new LLViewerTextEditor("",LLRect(0,0,0,0),S32_MAX,"");
switch(type)
{
// Text-based assets only.
case LLAssetType::AT_NOTECARD:
case LLAssetType::AT_LSL_TEXT:
- LLViewerTextEditor* edit = new LLViewerTextEditor("",LLRect(0,0,0,0),S32_MAX,"");
if(edit->importBuffer((char*)buffer, (S32)size))
{
std::string card = edit->getText();
@@ -269,13 +239,87 @@ void Lua_onAssetDownloaded(LLVFS *vfs,const LLUUID& asset_uuid,LLAssetType::ETyp
return;
}
break;
-
+ default:
+ LuaError(llformat("[requestInventoryAsset] Unknown type %s.",LLAssetType::lookup(type)).c_str());
+ LUA_CALL("OnAssetFailed") << req_key << LUA_END;
+ break;
}
}
else
{
- llinfos << "ao nc read error" << llendl;
+ llinfos << "requestInventoryAsset(): Asset read error: " << status << llendl;
+ LuaError("[requestInventoryAsset] Read error. ");
LUA_CALL("OnAssetFailed") << req_key << LUA_END;
return;
}
-}
+}
+void requestInventoryAsset_Event(LLUUID &reqID,LLUUID &task_id,LLUUID &item_id)
+{
+ llinfos << "requestInventoryAsset_Event("<< reqID <<","<< task_id <<","<< item_id <<"): Requesting asset." << llendl;
+ //LLViewerInventoryItem *item = gInventory.getItem(item_id);
+
+ llinfos << "requestInventoryAsset("<< item_id <<","<< task_id <<"): Getting item" << llendl;
+ LLViewerInventoryItem *item = gInventory.getItem(item_id);
+ if(!item)
+ {
+ LuaError(llformat("Could not find item %s.",item_id.asString()).c_str());
+ return;
+ }
+
+
+ llinfos << "requestInventoryAsset("<< item_id <<","<< task_id <<"): Checking if asset download is allowed" << llendl;
+ if (!gAgent.allowOperation(PERM_COPY, item->getPermissions(),GP_OBJECT_MANIPULATE) && gAgent.isGodlike())
+ {
+ LuaError(llformat("You do not have copy permission on %s %s.",
+ LLAssetType::lookupHumanReadable(item->getActualType()),
+ item->getName()).c_str());
+ return;
+ }
+
+ llinfos << "requestInventoryAsset("<< item_id <<","<< task_id <<"): Queueing asset request" << llendl;
+
+ LLHost source_sim = LLHost::invalid;
+ LLUUID invfolderid = item->getParentUUID();
+ gAssetStorage->getInvItemAsset(source_sim,
+ gAgent.getID(),
+ gAgent.getSessionID(),
+ item->getPermissions().getOwner(),
+ task_id,
+ item_id,
+ item->getAssetUUID(),
+ item->getType(),
+ &Lua_onAssetDownloaded,
+ (void*)new LLUUID(reqID),
+ TRUE);
+}
+
+
+LLUUID requestInventoryAsset(LLUUID item_id,LLUUID task_id)
+{
+ llinfos << "requestInventoryAsset("<< item_id <<","<< task_id <<"): Generating request key" << llendl;
+ LLUUID new_item_id=LLUUID::generateNewID();
+
+ /*
+ llinfos << "requestInventoryAsset("<< item_id <<","<< task_id <<"): Getting item" << llendl;
+ LLViewerInventoryItem *item = gInventory.getItem(item_id);
+ if(!item)
+ {
+ LuaError(llformat("Could not find item %s.",item_id.asString()).c_str());
+ return LLUUID::null;
+ }
+
+
+ llinfos << "requestInventoryAsset("<< item_id <<","<< task_id <<"): Checking if asset download is allowed" << llendl;
+ if (!gAgent.allowOperation(PERM_COPY, item->getPermissions(),GP_OBJECT_MANIPULATE) && gAgent.isGodlike())
+ {
+ LuaError(llformat("You do not have copy permission on %s %s.",
+ LLAssetType::lookupHumanReadable(item->getActualType()),
+ item->getName()).c_str());
+ return LLUUID::null;
+ }
+ */
+ llinfos << "requestInventoryAsset("<< item_id <<","<< task_id <<"): Queueing asset request" << llendl;
+ CB_Args3<LLUUID,LLUUID,LLUUID>(requestInventoryAsset_Event,new_item_id,task_id,item_id);
+
+ return new_item_id;
+}
3  indra/newview/LunaLua.cpp
View
@@ -254,7 +254,10 @@ bool operator> (const CB_Base& entry1, const CB_Base& entry2)
void FLLua::execClientEvents()
{
if(!sInstance)
+ {
+ llinfos << "LUA isn't running yet." << llendl;
return;
+ }
if(sInstance->mPendingEvents)
{
lldebugs << __LINE__ << ": Events pending. Iterating through events." << llendl;
214 indra/newview/_LuaSL.cpp
View
@@ -1510,78 +1510,92 @@ SWIG_Lua_dostring(lua_State *L, const char* str) {
/* -------- TYPES TABLE (BEGIN) -------- */
#define SWIGTYPE_p_EAnimate swig_types[0]
-#define SWIGTYPE_p_ESex swig_types[1]
-#define SWIGTYPE_p_EVOType swig_types[2]
-#define SWIGTYPE_p_LLCharacter swig_types[3]
-#define SWIGTYPE_p_LLColor3 swig_types[4]
-#define SWIGTYPE_p_LLColor4 swig_types[5]
-#define SWIGTYPE_p_LLColor4U swig_types[6]
-#define SWIGTYPE_p_LLInventoryModel swig_types[7]
-#define SWIGTYPE_p_LLJoint swig_types[8]
-#define SWIGTYPE_p_LLMatrix3 swig_types[9]
-#define SWIGTYPE_p_LLMatrix4 swig_types[10]
-#define SWIGTYPE_p_LLMotion swig_types[11]
-#define SWIGTYPE_p_LLMotionConstructor swig_types[12]
-#define SWIGTYPE_p_LLMotionController swig_types[13]
-#define SWIGTYPE_p_LLParcel swig_types[14]
-#define SWIGTYPE_p_LLPartSysData swig_types[15]
-#define SWIGTYPE_p_LLPauseRequestHandle swig_types[16]
-#define SWIGTYPE_p_LLPointerT_LLPauseRequestHandle_t swig_types[17]
-#define SWIGTYPE_p_LLPolyMesh swig_types[18]
-#define SWIGTYPE_p_LLQuaternion swig_types[19]
-#define SWIGTYPE_p_LLSD swig_types[20]
-#define SWIGTYPE_p_LLSafeHandleT_LLObjectSelection_t swig_types[21]
-#define SWIGTYPE_p_LLUUID swig_types[22]
-#define SWIGTYPE_p_LLVOAvatar swig_types[23]
-#define SWIGTYPE_p_LLVector2 swig_types[24]
-#define SWIGTYPE_p_LLVector3 swig_types[25]
-#define SWIGTYPE_p_LLVector3d swig_types[26]
-#define SWIGTYPE_p_LLVector4 swig_types[27]
-#define SWIGTYPE_p_LLViewerRegion swig_types[28]
-#define SWIGTYPE_p_LLVisualParam swig_types[29]
-#define SWIGTYPE_p_LLWearable swig_types[30]
-#define SWIGTYPE_p_ParticleSystem swig_types[31]
-#define SWIGTYPE_p_WLSky swig_types[32]
-#define SWIGTYPE_p_WLWater swig_types[33]
-#define SWIGTYPE_p_cat_array_t swig_types[34]
-#define SWIGTYPE_p_child_list_t swig_types[35]
-#define SWIGTYPE_p_const_child_list_t swig_types[36]
-#define SWIGTYPE_p_double swig_types[37]
-#define SWIGTYPE_p_eLayoutOrientation swig_types[38]
-#define SWIGTYPE_p_eObjectPartitions swig_types[39]
-#define SWIGTYPE_p_e_action_type swig_types[40]
-#define SWIGTYPE_p_e_anim_request swig_types[41]
-#define SWIGTYPE_p_e_camera_modes swig_types[42]
-#define SWIGTYPE_p_e_camera_position swig_types[43]
-#define SWIGTYPE_p_e_grid_mode swig_types[44]
-#define SWIGTYPE_p_e_object_update_type swig_types[45]
-#define SWIGTYPE_p_e_selection_type swig_types[46]
-#define SWIGTYPE_p_e_send_type swig_types[47]
-#define SWIGTYPE_p_float swig_types[48]
-#define SWIGTYPE_p_int swig_types[49]
-#define SWIGTYPE_p_item_array_t swig_types[50]
-#define SWIGTYPE_p_iterator swig_types[51]
-#define SWIGTYPE_p_list_t swig_types[52]
-#define SWIGTYPE_p_long_long swig_types[53]
-#define SWIGTYPE_p_root_iterator swig_types[54]
-#define SWIGTYPE_p_root_object_iterator swig_types[55]
-#define SWIGTYPE_p_short swig_types[56]
-#define SWIGTYPE_p_signed_char swig_types[57]
-#define SWIGTYPE_p_skip_list_t swig_types[58]
-#define SWIGTYPE_p_std__mapT_std__string_double_t swig_types[59]
-#define SWIGTYPE_p_std__string swig_types[60]
-#define SWIGTYPE_p_std__vectorT_LLCharacter_p_t swig_types[61]
-#define SWIGTYPE_p_unsigned_char swig_types[62]
-#define SWIGTYPE_p_unsigned_int swig_types[63]
-#define SWIGTYPE_p_unsigned_long_long swig_types[64]
-#define SWIGTYPE_p_unsigned_short swig_types[65]
-#define SWIGTYPE_p_valid_iterator swig_types[66]
-#define SWIGTYPE_p_valid_root_iterator swig_types[67]
-#define SWIGTYPE_p_vobj_list_t swig_types[68]
-#define SWIGTYPE_p_void swig_types[69]
-#define SWIGTYPE_p_wchar_t swig_types[70]
-static swig_type_info *swig_types[72];
-static swig_module_info swig_module = {swig_types, 71, 0, 0, 0, 0};
+#define SWIGTYPE_p_EHitTestType swig_types[1]
+#define SWIGTYPE_p_ESex swig_types[2]
+#define SWIGTYPE_p_EVOType swig_types[3]
+#define SWIGTYPE_p_LLCharacter swig_types[4]
+#define SWIGTYPE_p_LLColor3 swig_types[5]
+#define SWIGTYPE_p_LLColor4 swig_types[6]
+#define SWIGTYPE_p_LLColor4U swig_types[7]
+#define SWIGTYPE_p_LLInventoryModel swig_types[8]
+#define SWIGTYPE_p_LLJoint swig_types[9]
+#define SWIGTYPE_p_LLMatrix3 swig_types[10]
+#define SWIGTYPE_p_LLMatrix4 swig_types[11]
+#define SWIGTYPE_p_LLMotion swig_types[12]
+#define SWIGTYPE_p_LLMotionConstructor swig_types[13]
+#define SWIGTYPE_p_LLMotionController swig_types[14]
+#define SWIGTYPE_p_LLParcel swig_types[15]
+#define SWIGTYPE_p_LLPartSysData swig_types[16]
+#define SWIGTYPE_p_LLPauseRequestHandle swig_types[17]
+#define SWIGTYPE_p_LLPointerT_LLPauseRequestHandle_t swig_types[18]
+#define SWIGTYPE_p_LLPolyMesh swig_types[19]
+#define SWIGTYPE_p_LLQuaternion swig_types[20]
+#define SWIGTYPE_p_LLSD swig_types[21]
+#define SWIGTYPE_p_LLSafeHandleT_LLObjectSelection_t swig_types[22]
+#define SWIGTYPE_p_LLUUID swig_types[23]
+#define SWIGTYPE_p_LLVOAvatar swig_types[24]
+#define SWIGTYPE_p_LLVector2 swig_types[25]
+#define SWIGTYPE_p_LLVector3 swig_types[26]
+#define SWIGTYPE_p_LLVector3d swig_types[27]
+#define SWIGTYPE_p_LLVector4 swig_types[28]
+#define SWIGTYPE_p_LLViewerRegion swig_types[29]
+#define SWIGTYPE_p_LLVisualParam swig_types[30]
+#define SWIGTYPE_p_LLWearable swig_types[31]
+#define SWIGTYPE_p_ParticleSystem swig_types[32]
+#define SWIGTYPE_p_WLSky swig_types[33]
+#define SWIGTYPE_p_WLWater swig_types[34]
+#define SWIGTYPE_p_cat_array_t swig_types[35]
+#define SWIGTYPE_p_child_list_const_iter_t swig_types[36]
+#define SWIGTYPE_p_child_list_const_reverse_iter_t swig_types[37]
+#define SWIGTYPE_p_child_list_iter_t swig_types[38]
+#define SWIGTYPE_p_child_list_reverse_iter_t swig_types[39]
+#define SWIGTYPE_p_child_list_t swig_types[40]
+#define SWIGTYPE_p_child_tab_order_const_iter_t swig_types[41]
+#define SWIGTYPE_p_child_tab_order_const_reverse_iter_t swig_types[42]
+#define SWIGTYPE_p_child_tab_order_iter_t swig_types[43]
+#define SWIGTYPE_p_child_tab_order_reverse_iter_t swig_types[44]
+#define SWIGTYPE_p_child_tab_order_t swig_types[45]
+#define SWIGTYPE_p_const_child_list_t swig_types[46]
+#define SWIGTYPE_p_ctrl_list_t swig_types[47]
+#define SWIGTYPE_p_double swig_types[48]
+#define SWIGTYPE_p_eLayoutOrientation swig_types[49]
+#define SWIGTYPE_p_eObjectPartitions swig_types[50]
+#define SWIGTYPE_p_e_action_type swig_types[51]
+#define SWIGTYPE_p_e_anim_request swig_types[52]
+#define SWIGTYPE_p_e_camera_modes swig_types[53]
+#define SWIGTYPE_p_e_camera_position swig_types[54]
+#define SWIGTYPE_p_e_grid_mode swig_types[55]
+#define SWIGTYPE_p_e_object_update_type swig_types[56]
+#define SWIGTYPE_p_e_selection_type swig_types[57]
+#define SWIGTYPE_p_e_send_type swig_types[58]
+#define SWIGTYPE_p_factory_map_t swig_types[59]
+#define SWIGTYPE_p_float swig_types[60]
+#define SWIGTYPE_p_int swig_types[61]
+#define SWIGTYPE_p_item_array_t swig_types[62]
+#define SWIGTYPE_p_iterator swig_types[63]
+#define SWIGTYPE_p_list_t swig_types[64]
+#define SWIGTYPE_p_long_long swig_types[65]
+#define SWIGTYPE_p_root_iterator swig_types[66]
+#define SWIGTYPE_p_root_object_iterator swig_types[67]
+#define SWIGTYPE_p_short swig_types[68]
+#define SWIGTYPE_p_signed_char swig_types[69]
+#define SWIGTYPE_p_skip_list_t swig_types[70]
+#define SWIGTYPE_p_std__mapT_std__string_double_t swig_types[71]
+#define SWIGTYPE_p_std__string swig_types[72]
+#define SWIGTYPE_p_std__vectorT_LLCharacter_p_t swig_types[73]
+#define SWIGTYPE_p_tab_order_pair_t swig_types[74]
+#define SWIGTYPE_p_tab_order_t swig_types[75]
+#define SWIGTYPE_p_unsigned_char swig_types[76]
+#define SWIGTYPE_p_unsigned_int swig_types[77]
+#define SWIGTYPE_p_unsigned_long_long swig_types[78]
+#define SWIGTYPE_p_unsigned_short swig_types[79]
+#define SWIGTYPE_p_valid_iterator swig_types[80]
+#define SWIGTYPE_p_valid_root_iterator swig_types[81]
+#define SWIGTYPE_p_vobj_list_t swig_types[82]
+#define SWIGTYPE_p_void swig_types[83]
+#define SWIGTYPE_p_wchar_t swig_types[84]
+static swig_type_info *swig_types[86];
+static swig_module_info swig_module = {swig_types, 85, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -21918,6 +21932,7 @@ static swig_lua_const_info swig_constants[] = {
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
static swig_type_info _swigt__p_EAnimate = {"_p_EAnimate", "EAnimate *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_EHitTestType = {"_p_EHitTestType", "EHitTestType *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_ESex = {"_p_ESex", "ESex *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_EVOType = {"_p_EVOType", "EVOType *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_LLCharacter = {"_p_LLCharacter", "LLCharacter *", 0, 0, (void*)&_wrap_class_LLCharacter, 0};
@@ -21952,8 +21967,18 @@ static swig_type_info _swigt__p_ParticleSystem = {"_p_ParticleSystem", "Particle
static swig_type_info _swigt__p_WLSky = {"_p_WLSky", "WLSky *", 0, 0, (void*)&_wrap_class_WLSky, 0};
static swig_type_info _swigt__p_WLWater = {"_p_WLWater", "WLWater *", 0, 0, (void*)&_wrap_class_WLWater, 0};
static swig_type_info _swigt__p_cat_array_t = {"_p_cat_array_t", "cat_array_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_list_const_iter_t = {"_p_child_list_const_iter_t", "child_list_const_iter_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_list_const_reverse_iter_t = {"_p_child_list_const_reverse_iter_t", "child_list_const_reverse_iter_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_list_iter_t = {"_p_child_list_iter_t", "child_list_iter_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_list_reverse_iter_t = {"_p_child_list_reverse_iter_t", "child_list_reverse_iter_t *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_child_list_t = {"_p_child_list_t", "child_list_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_tab_order_const_iter_t = {"_p_child_tab_order_const_iter_t", "child_tab_order_const_iter_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_tab_order_const_reverse_iter_t = {"_p_child_tab_order_const_reverse_iter_t", "child_tab_order_const_reverse_iter_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_tab_order_iter_t = {"_p_child_tab_order_iter_t", "child_tab_order_iter_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_tab_order_reverse_iter_t = {"_p_child_tab_order_reverse_iter_t", "child_tab_order_reverse_iter_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_child_tab_order_t = {"_p_child_tab_order_t", "child_tab_order_t *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_const_child_list_t = {"_p_const_child_list_t", "const_child_list_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ctrl_list_t = {"_p_ctrl_list_t", "ctrl_list_t *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_double = {"_p_double", "double *|F64 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_eLayoutOrientation = {"_p_eLayoutOrientation", "eLayoutOrientation *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_eObjectPartitions = {"_p_eObjectPartitions", "eObjectPartitions *", 0, 0, (void*)0, 0};
@@ -21965,6 +21990,7 @@ static swig_type_info _swigt__p_e_grid_mode = {"_p_e_grid_mode", "enum e_grid_mo
static swig_type_info _swigt__p_e_object_update_type = {"_p_e_object_update_type", "enum e_object_update_type *|EObjectUpdateType *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_e_selection_type = {"_p_e_selection_type", "enum e_selection_type *|ESelectType *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_e_send_type = {"_p_e_send_type", "enum e_send_type *|ESendType *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_factory_map_t = {"_p_factory_map_t", "factory_map_t *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_float = {"_p_float", "float *|F32 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_int = {"_p_int", "BOOL *|int *|S32 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_item_array_t = {"_p_item_array_t", "item_array_t *", 0, 0, (void*)0, 0};
@@ -21979,6 +22005,8 @@ static swig_type_info _swigt__p_skip_list_t = {"_p_skip_list_t", "skip_list_t *"
static swig_type_info _swigt__p_std__mapT_std__string_double_t = {"_p_std__mapT_std__string_double_t", "std::map< std::string,double > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_std__string = {"_p_std__string", "std::string *", 0, 0, (void*)&_wrap_class_std_string, 0};
static swig_type_info _swigt__p_std__vectorT_LLCharacter_p_t = {"_p_std__vectorT_LLCharacter_p_t", "std::vector< LLCharacter * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_tab_order_pair_t = {"_p_tab_order_pair_t", "tab_order_pair_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_tab_order_t = {"_p_tab_order_t", "tab_order_t *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|KEY *|U8 *|LLPCode *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|U32 *|MASK *|TPACKETID *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "unsigned long long *|U64 *", 0, 0, (void*)0, 0};
@@ -21991,6 +22019,7 @@ static swig_type_info _swigt__p_wchar_t = {"_p_wchar_t", "llwchar *|wchar_t *",
static swig_type_info *swig_type_initial[] = {
&_swigt__p_EAnimate,
+ &_swigt__p_EHitTestType,
&_swigt__p_ESex,
&_swigt__p_EVOType,
&_swigt__p_LLCharacter,
@@ -22025,8 +22054,18 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_WLSky,
&_swigt__p_WLWater,
&_swigt__p_cat_array_t,
+ &_swigt__p_child_list_const_iter_t,
+ &_swigt__p_child_list_const_reverse_iter_t,
+ &_swigt__p_child_list_iter_t,
+ &_swigt__p_child_list_reverse_iter_t,
&_swigt__p_child_list_t,
+ &_swigt__p_child_tab_order_const_iter_t,
+ &_swigt__p_child_tab_order_const_reverse_iter_t,
+ &_swigt__p_child_tab_order_iter_t,
+ &_swigt__p_child_tab_order_reverse_iter_t,
+ &_swigt__p_child_tab_order_t,
&_swigt__p_const_child_list_t,
+ &_swigt__p_ctrl_list_t,
&_swigt__p_double,
&_swigt__p_eLayoutOrientation,
&_swigt__p_eObjectPartitions,
@@ -22038,6 +22077,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_e_object_update_type,
&_swigt__p_e_selection_type,
&_swigt__p_e_send_type,
+ &_swigt__p_factory_map_t,
&_swigt__p_float,
&_swigt__p_int,
&_swigt__p_item_array_t,
@@ -22052,6 +22092,8 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_std__mapT_std__string_double_t,
&_swigt__p_std__string,
&_swigt__p_std__vectorT_LLCharacter_p_t,
+ &_swigt__p_tab_order_pair_t,
+ &_swigt__p_tab_order_t,
&_swigt__p_unsigned_char,
&_swigt__p_unsigned_int,
&_swigt__p_unsigned_long_long,
@@ -22064,6 +22106,7 @@ static swig_type_info *swig_type_initial[] = {
};
static swig_cast_info _swigc__p_EAnimate[] = { {&_swigt__p_EAnimate, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_EHitTestType[] = { {&_swigt__p_EHitTestType, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_ESex[] = { {&_swigt__p_ESex, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_EVOType[] = { {&_swigt__p_EVOType, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_LLCharacter[] = { {&_swigt__p_LLCharacter, 0, 0, 0},{0, 0, 0, 0}};
@@ -22098,8 +22141,18 @@ static swig_cast_info _swigc__p_ParticleSystem[] = { {&_swigt__p_ParticleSystem
static swig_cast_info _swigc__p_WLSky[] = { {&_swigt__p_WLSky, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_WLWater[] = { {&_swigt__p_WLWater, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_cat_array_t[] = { {&_swigt__p_cat_array_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_list_const_iter_t[] = { {&_swigt__p_child_list_const_iter_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_list_const_reverse_iter_t[] = { {&_swigt__p_child_list_const_reverse_iter_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_list_iter_t[] = { {&_swigt__p_child_list_iter_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_list_reverse_iter_t[] = { {&_swigt__p_child_list_reverse_iter_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_child_list_t[] = { {&_swigt__p_child_list_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_tab_order_const_iter_t[] = { {&_swigt__p_child_tab_order_const_iter_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_tab_order_const_reverse_iter_t[] = { {&_swigt__p_child_tab_order_const_reverse_iter_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_tab_order_iter_t[] = { {&_swigt__p_child_tab_order_iter_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_tab_order_reverse_iter_t[] = { {&_swigt__p_child_tab_order_reverse_iter_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_child_tab_order_t[] = { {&_swigt__p_child_tab_order_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_const_child_list_t[] = { {&_swigt__p_const_child_list_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ctrl_list_t[] = { {&_swigt__p_ctrl_list_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_double[] = { {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_eLayoutOrientation[] = { {&_swigt__p_eLayoutOrientation, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_eObjectPartitions[] = { {&_swigt__p_eObjectPartitions, 0, 0, 0},{0, 0, 0, 0}};
@@ -22111,6 +22164,7 @@ static swig_cast_info _swigc__p_e_grid_mode[] = { {&_swigt__p_e_grid_mode, 0, 0
static swig_cast_info _swigc__p_e_object_update_type[] = { {&_swigt__p_e_object_update_type, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_e_selection_type[] = { {&_swigt__p_e_selection_type, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_e_send_type[] = { {&_swigt__p_e_send_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_factory_map_t[] = { {&_swigt__p_factory_map_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_float[] = { {&_swigt__p_float, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_item_array_t[] = { {&_swigt__p_item_array_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -22125,6 +22179,8 @@ static swig_cast_info _swigc__p_skip_list_t[] = { {&_swigt__p_skip_list_t, 0, 0
static swig_cast_info _swigc__p_std__mapT_std__string_double_t[] = { {&_swigt__p_std__mapT_std__string_double_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_std__string[] = { {&_swigt__p_std__string, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_std__vectorT_LLCharacter_p_t[] = { {&_swigt__p_std__vectorT_LLCharacter_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_tab_order_pair_t[] = { {&_swigt__p_tab_order_pair_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_tab_order_t[] = { {&_swigt__p_tab_order_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_unsigned_char[] = { {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_unsigned_long_long[] = { {&_swigt__p_unsigned_long_long, 0, 0, 0},{0, 0, 0, 0}};
@@ -22137,6 +22193,7 @@ static swig_cast_info _swigc__p_wchar_t[] = { {&_swigt__p_wchar_t, 0, 0, 0},{0,
static swig_cast_info *swig_cast_initial[] = {
_swigc__p_EAnimate,
+ _swigc__p_EHitTestType,
_swigc__p_ESex,
_swigc__p_EVOType,
_swigc__p_LLCharacter,
@@ -22171,8 +22228,18 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_WLSky,
_swigc__p_WLWater,
_swigc__p_cat_array_t,
+ _swigc__p_child_list_const_iter_t,
+ _swigc__p_child_list_const_reverse_iter_t,
+ _swigc__p_child_list_iter_t,
+ _swigc__p_child_list_reverse_iter_t,
_swigc__p_child_list_t,
+ _swigc__p_child_tab_order_const_iter_t,
+ _swigc__p_child_tab_order_const_reverse_iter_t,
+ _swigc__p_child_tab_order_iter_t,
+ _swigc__p_child_tab_order_reverse_iter_t,
+ _swigc__p_child_tab_order_t,
_swigc__p_const_child_list_t,
+ _swigc__p_ctrl_list_t,
_swigc__p_double,
_swigc__p_eLayoutOrientation,
_swigc__p_eObjectPartitions,
@@ -22184,6 +22251,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_e_object_update_type,
_swigc__p_e_selection_type,
_swigc__p_e_send_type,
+ _swigc__p_factory_map_t,
_swigc__p_float,
_swigc__p_int,
_swigc__p_item_array_t,
@@ -22198,6 +22266,8 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_std__mapT_std__string_double_t,
_swigc__p_std__string,
_swigc__p_std__vectorT_LLCharacter_p_t,
+ _swigc__p_tab_order_pair_t,
+ _swigc__p_tab_order_t,
_swigc__p_unsigned_char,
_swigc__p_unsigned_int,
_swigc__p_unsigned_long_long,
8 indra/newview/a_phoenixviewerlink.cpp
View
@@ -56,7 +56,7 @@
std::string PhoenixViewerLink::blacklist_version;
LLSD PhoenixViewerLink::blocked_login_info = 0;
-LLSD PhoenixViewerLink::Ascent_tags = 0;
+LLSD PhoenixViewerLink::phoenix_tags = 0;
BOOL PhoenixViewerLink::msDataDone = FALSE;
PhoenixViewerLink* PhoenixViewerLink::sInstance;
@@ -110,7 +110,7 @@ void PhoenixViewerLink::downloadClientTags()
{
//url = "http://viewertags.com/app/client_list.xml";
std::string url("http://viewertags.com/app/client_list.xml");
- if(gSavedSettings.getBOOL("AscentDontUseMultipleColorTags"))
+ if(gSavedSettings.getBOOL("PhoenixDontUseMultipleColorTags"))
{
url="http://viewertags.com/app/client_list_unified_colours.xml";
}
@@ -359,7 +359,7 @@ std::string PhoenixViewerLink::processRequestForInfo(LLUUID requester, std::stri
args["NAME"] = name;
args["FROMUUID"]=requester;
args["SESSIONID"]=sessionid;
- LLNotifications::instance().add("PhoenixReqInfo",args,LLSD(), callbackAscentReqInfo);
+ LLNotifications::instance().add("PhoenixReqInfo",args,LLSD(), callbackPhoenixReqInfo);
return outmessage;
}
@@ -397,7 +397,7 @@ void PhoenixViewerLink::sendInfo(LLUUID destination, LLUUID sessionid, std::stri
gIMMgr->addMessage(gIMMgr->computeSessionID(dialog,destination),destination,myName,"Information Sent: "+
myInfo1+"\n"+myInfo2);
}
-void PhoenixViewerLink::callbackAscentReqInfo(const LLSD &notification, const LLSD &response)
+void PhoenixViewerLink::callbackPhoenixReqInfo(const LLSD &notification, const LLSD &response)
{
S32 option = LLNotification::getSelectedOption(notification, response);
std::string my_name;
4 indra/newview/a_phoenixviewerlink.h
View
@@ -82,10 +82,10 @@ class PhoenixViewerLink
static std::string processRequestForInfo(LLUUID requester,std::string message, std::string name, LLUUID sessionid);
static std::string getMyInfo(int part =0);
- static void callbackAscentReqInfo(const LLSD &notification, const LLSD &response);
+ static void callbackPhoenixReqInfo(const LLSD &notification, const LLSD &response);
static void sendInfo(LLUUID destination, LLUUID sessionid, std::string myName, EInstantMessage dialog);
- static LLSD Ascent_tags;
+ static LLSD phoenix_tags;
std::set<std::string> blocked_versions;
static LLSD blocked_login_info;
std::string ms_motd;
54 indra/newview/app_settings/settings.xml
View
@@ -7076,6 +7076,38 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>LuaChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.39</real>
+ <real>0.81</real>
+ <real>0.96</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>LuaConsoleRect</key>
+ <map>
+ <key>Comment</key>
+ <string>LOLRectangle</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Rect</string>
+ <key>Value</key>
+ <array>
+ <integer>0</integer>
+ <integer>400</integer>
+ <integer>400</integer>
+ <integer>0</integer>
+ </array>
+ </map>
<key>LunaCmdLineLua</key>
<map>
<key>Comment</key>
@@ -7096,6 +7128,17 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
+ <string>/macro</string>
+ </map>
+ <key>LunaCmdLineShortMacro</key>
+ <map>
+ <key>Comment</key>
+ <string>Automatically generated by scripts/settings.py</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
<string>/m</string>
</map>
<key>MainloopTimeoutDefault</key>
@@ -16795,6 +16838,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>WarnFirstTPV</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstTPV warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>WarnFirstTeleport</key>
<map>
<key>Comment</key>
11 indra/newview/app_settings/settings_per_account.xml
View
@@ -499,6 +499,17 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
+ <string>/macro</string>
+ </map>
+ <key>LunaCmdLineShortMacro</key>
+ <map>
+ <key>Comment</key>
+ <string>Automatically generated by scripts/settings.py</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
<string>/m</string>
</map>
<key>MoyMiniMapCustomColor</key>
77 indra/newview/character/avatar_lad.xml
View
@@ -1651,6 +1651,26 @@
</layer>
<layer name="head_tattoo">
<texture local_texture="head_tattoo" />
+ <param id="1062" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_head_red" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="255, 0, 0, 255" />
+ </param_color>
+ </param>
+
+ <param id="1063" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_head_green" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="0, 255, 0, 255" />
+ </param_color>
+ </param>
+
+ <param id="1064" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_head_blue" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="0, 0, 255, 255" />
+ </param_color>
+ </param>
</layer>
</layer_set>
<!-- =========================================================== -->
@@ -1696,6 +1716,24 @@
</layer>
<layer name="upper_tattoo">
<texture local_texture="upper_tattoo" />
+ <param id="1065" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_upper_red" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="255, 0, 0, 255" />
+ </param_color>
+ </param>
+ <param id="1066" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_upper_green" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="0, 255, 0, 255" />
+ </param_color>
+ </param>
+ <param id="1067" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_upper_blue" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="0, 0, 255, 255" />
+ </param_color>
+ </param>
</layer>
<layer name="upper_undershirt bump" render_pass="bump" fixed_color="128,128,128,255">
<texture local_texture="upper_undershirt" local_texture_alpha_only="true" />
@@ -2018,6 +2056,24 @@
</layer>
<layer name="lower_tattoo">
<texture local_texture="lower_tattoo" />
+ <param id="1068" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_lower_red" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="255, 0, 0, 255" />
+ </param_color>
+ </param>
+ <param id="1069" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_lower_green" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="0, 255, 0, 255" />
+ </param_color>
+ </param>
+ <param id="1070" group="1" edit_group="colorpicker_driven" wearable="tattoo" name="tattoo_lower_blue" value_min="0" value_max="1" value_default="1">
+ <param_color>
+ <value color="0, 0, 0, 255" />
+ <value color="0, 0, 255, 255" />
+ </param_color>
+ </param>
</layer>
<layer name="lower_underpants bump" render_pass="bump" fixed_color="128,128,128,255">
<texture local_texture="lower_underpants" local_texture_alpha_only="true" />
@@ -2846,5 +2902,26 @@
<driven id="876" />
</param_driver>
</param>
+ <param id="1071" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_red" value_min="0" value_max="1" value_default="1">
+ <param_driver>
+ <driven id="1062" min1="0" max1="1" max2="1" min2="1" />
+ <driven id="1065" min1="0" max1="1" max2="1" min2="1" />
+ <driven id="1068" min1="0" max1="1" max2="1" min2="1" />
+ </param_driver>
+ </param>
+ <param id="1072" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_green" value_min="0" value_max="1" value_default="1">
+ <param_driver>
+ <driven id="1063" min1="0" max1="1" max2="1" min2="1" />
+ <driven id="1066" min1="0" max1="1" max2="1" min2="1" />
+ <driven id="1069" min1="0" max1="1" max2="1" min2="1" />
+ </param_driver>
+ </param>
+ <param id="1073" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_blue" value_min="0" value_max="1" value_default="1">
+ <param_driver>
+ <driven id="1064" min1="0" max1="1" max2="1" min2="1" />
+ <driven id="1067" min1="0" max1="1" max2="1" min2="1" />
+ <driven id="1070" min1="0" max1="1" max2="1" min2="1" />
+ </param_driver>
+ </param>
</driver_parameters>
</linden_avatar>
12 indra/newview/floaterao.cpp
View
@@ -137,20 +137,27 @@ BOOL AONoteCardDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
if(getParent())
{
handled = TRUE;
+ llinfos << "AONoteCardDropTarget::handleDragAndDrop(): LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;" << llendl;
LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
+ llinfos << "AONoteCardDropTarget::handleDragAndDrop(): if(gInventory.getItem(inv_item->getUUID()))" << llendl;
if(gInventory.getItem(inv_item->getUUID()))
{
+ llinfos << "AONoteCardDropTarget::handleDragAndDrop(): *accept=ACCEPT_YES_COPY_SINGLE;" << llendl;
*accept = ACCEPT_YES_COPY_SINGLE;
if(drop)
{
+ llinfos << "AONoteCardDropTarget::handleDragAndDrop(): mDropCallback(inv_item);" << llendl;
mDownCallback(inv_item);
}
}
else
{
+ llinfos << "AONoteCardDropTarget::handleDragAndDrop(): *accept=ACCEPT_NO;" << llendl;
*accept = ACCEPT_NO;
}
}
+
+ llinfos << "AONoteCardDropTarget::handleDragAndDrop(): return handled;" << llendl;
return handled;
}
@@ -460,8 +467,13 @@ void LLFloaterAO::setCurrentStandId(const LLUUID& id)
void LLFloaterAO::AOItemDrop(LLViewerInventoryItem* item)
{
+ llinfos << "LLFloaterAO::AOItemDrop("<< item->getUUID() <<"): LUA_CALL" << llendl;
LUA_CALL("OnAONotecard") << item->getUUID() << LUA_END;
+
+ llinfos << "LLFloaterAO::AOItemDrop("<< item->getUUID() <<"): gSavedPerAccountSettings" << llendl;
gSavedPerAccountSettings.setString("PhoenixAOConfigNotecardID",item->getAssetUUID().asString());
+
+ llinfos << "LLFloaterAO::AOItemDrop("<< item->getUUID() <<"): childSetValue" << llendl;
sInstance->childSetValue("ao_nc_text","Currently set to: "+item->getName());
}
6 indra/newview/growlmanager.cpp
View
@@ -140,7 +140,7 @@ void GrowlManager::loadConfig()
void GrowlManager::notify(const std::string& notification_title, const std::string& notification_message, const std::string& notification_type)
{
- static BOOL* enabled = rebind_llcontrol<BOOL>("AscentEnableGrowl", &gSavedSettings, true);
+ static BOOL* enabled = rebind_llcontrol<BOOL>("PhoenixEnableGrowl", &gSavedSettings, true);
if(!*enabled)
return;
@@ -174,7 +174,7 @@ bool GrowlManager::onLLNotification(const LLSD& notice)
{
if(notice["sigtype"].asString() != "add")
return false;
- static BOOL* enabled = rebind_llcontrol<BOOL>("AscentEnableGrowl", &gSavedSettings, true);
+ static BOOL* enabled = rebind_llcontrol<BOOL>("PhoenixEnableGrowl", &gSavedSettings, true);
if(!*enabled)
return false;
if(!shouldNotify())
@@ -209,7 +209,7 @@ bool GrowlManager::onLLNotification(const LLSD& notice)
bool GrowlManager::shouldNotify()
{
// This magic stolen from llappviewer.cpp. LLViewerWindow::getActive lies.
- static BOOL* activated = rebind_llcontrol<BOOL>("AscentGrowlWhenActive", &gSavedSettings, true);
+ static BOOL* activated = rebind_llcontrol<BOOL>("PhoenixGrowlWhenActive", &gSavedSettings, true);
return (*activated || (!gViewerWindow->mWindow->getVisible() || !gFocusMgr.getAppHasFocus()));
}
36 indra/newview/llagent.cpp
View
@@ -241,7 +241,7 @@ BOOL LLAgent::sFirstPersonBtnState;
BOOL LLAgent::sMouselookBtnState;
BOOL LLAgent::sThirdPersonBtnState;
BOOL LLAgent::sBuildBtnState;
-BOOL LLAgent::AscentForceFly;
+BOOL LLAgent::PhoenixForceFly;
BOOL LLAgent::lure_show = FALSE;
std::string LLAgent::lure_name;
@@ -457,12 +457,12 @@ LLAgent::LLAgent() :
}
mFollowCam.setMaxCameraDistantFromSubject( MAX_CAMERA_DISTANCE_FROM_AGENT );
- //AscentForceFly = gSavedSettings.getBOOL("AscentAlwaysFly");
- //gSavedSettings.getControl("AscentAlwaysFly")->getSignal()->connect(boost::bind(&updateAscentForceFly,_1));
+ //PhoenixForceFly = gSavedSettings.getBOOL("PhoenixAlwaysFly");
+ //gSavedSettings.getControl("PhoenixAlwaysFly")->getSignal()->connect(&updatePhoenixForceFly);
}
-void LLAgent::updateAscentForceFly(const LLSD &data)
+void LLAgent::updatePhoenixForceFly(const LLSD &data)
{
- AscentForceFly = data.asBoolean();
+ PhoenixForceFly = data.asBoolean();
}
void LLAgent::updateIgnorePrejump(const LLSD &data)
@@ -498,13 +498,12 @@ void LLAgent::init()
// LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f);
- mEffectColor = LLSavedSettingsGlue::getCOAColor4("EffectColor");
- ignorePrejump = LLSavedSettingsGlue::getCOABOOL("AscentIgnoreFinishAnimation");
- //LLSavedSettingsGlue::getCOAControl("AscentIgnoreFinishAnimation")->getSignal()->connect(boost::bind(&updateIgnorePrejump,_1));
- AscentForceFly = LLSavedSettingsGlue::getCOABOOL("AscentAlwaysFly");
- //LLSavedSettingsGlue::getCOAControl("AscentAlwaysFly")->getSignal()->connect(boost::bind(&updateAscentForceFly,_1));
- mBlockSpam=LLSavedSettingsGlue::getCOABOOL("AscentBlockSpam");
-
+ mEffectColor = gSavedSettings.getColor4("EffectColor");
+ ignorePrejump = gSavedSettings.getBOOL("PhoenixIgnoreFinishAnimation");
+ gSavedSettings.getControl("PhoenixIgnoreFinishAnimation")->getSignal()->connect(boost::bind(&updateIgnorePrejump,_1));
+ PhoenixForceFly = gSavedSettings.getBOOL("PhoenixAlwaysFly");
+ gSavedSettings.getControl("PhoenixAlwaysFly")->getSignal()->connect(boost::bind(&updatePhoenixForceFly,_1));
+ mBlockSpam=gSavedSettings.getBOOL("PhoenixBlockSpam");
mInitialized = TRUE;
// @hook OnAgentInit(name, is_godlike) On login, tells the Lua engine the name of the user and whether it's a Linden or not.
@@ -830,7 +829,7 @@ BOOL LLAgent::canFly()
// [/RLVa:KB]
if (isGodlike()) return TRUE;
//LGG always fly code
- if(AscentForceFly) return TRUE;
+ if(PhoenixForceFly) return TRUE;
LLViewerRegion* regionp = getRegion();
if (regionp && regionp->getBlockFly()) return FALSE;
@@ -2986,11 +2985,11 @@ static const LLFloaterView::skip_list_t& get_skip_list()
{
static LLFloaterView::skip_list_t skip_list;
skip_list.insert(LLFloaterMap::getInstance());
-// static BOOL *sPhoenixShowStatusBarInMouselook = rebind_llcontrol<BOOL>("PhoenixShowStatusBarInMouselook", &gSavedSettings, true);
-// if(*sPhoenixShowStatusBarInMouselook)
-// {
+ static BOOL *sPhoenixShowStatusBarInMouselook = rebind_llcontrol<BOOL>("PhoenixShowStatusBarInMouselook", &gSavedSettings, true);
+ if(*sPhoenixShowStatusBarInMouselook)
+ {
// skip_list.insert(LLFloaterStats::getInstance());
-// }
+ }
return skip_list;
}
@@ -4155,7 +4154,8 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
if( mCameraMode != CAMERA_MODE_MOUSELOOK )
{
gFocusMgr.setKeyboardFocus( NULL );
-
+
+
mLastCameraMode = mCameraMode;
mCameraMode = CAMERA_MODE_MOUSELOOK;
U32 old_flags = mControlFlags;
4 indra/newview/llagent.h
View
@@ -831,9 +831,9 @@ class LLAgent : public LLObservable
static BOOL mForceTPose;
bool mbTeleportKeepsLookAt; // try to keep look-at after teleport is complete
static BOOL ignorePrejump;
- static BOOL AscentForceFly;
+ static BOOL PhoenixForceFly;
static void updateIgnorePrejump(const LLSD &data);
- static void updateAscentForceFly(const LLSD &data);
+ static void updatePhoenixForceFly(const LLSD &data);
static BOOL AscentPhantom;
bool mbAlwaysRun; // should the avatar run by default rather than walk
117 indra/newview/llselectmgr.cpp
View
@@ -85,12 +85,16 @@
#include "llvoavatar.h"
#include "llvovolume.h"
#include "pipeline.h"
-// <edit>
-#include "llfloaterexport.h"
-// </edit>
#include "llglheaders.h"
+#include "llparcel.h" // moymod
+#include "llviewerparcelmgr.h" // moymod
+
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
LLViewerObject* getSelectedParentObject(LLViewerObject *object) ;
//
// Consts
@@ -1449,19 +1453,12 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
if (!mItem)
{
object->sendTEUpdate();
- // 1 particle effect per object
- // <edit>
- if(!gSavedSettings.getBOOL("DisablePointAtAndBeam"))
- {
- // </edit>
- LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
- effectp->setSourceObject(gAgent.getAvatarObject());
- effectp->setTargetObject(object);
- effectp->setDuration(LL_HUD_DUR_SHORT);
- effectp->setColor(LLColor4U(gAgent.getEffectColor()));
- // <edit>
- }
- // </edit>
+ // 1 particle effect per object
+ LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+ effectp->setSourceObject(gAgent.getAvatarObject());
+ effectp->setTargetObject(object);
+ effectp->setDuration(LL_HUD_DUR_SHORT);
+ effectp->setColor(LLColor4U(gAgent.getEffectColor()));
}
return true;
}
@@ -2798,17 +2795,14 @@ bool LLSelectMgr::confirmDelete(const LLSD& notification, const LLSD& response,
(void*)info,
SEND_ONLY_ROOTS);
// VEFFECT: Delete Object - one effect for all deletes
- if(!gSavedSettings.getBOOL("DisablePointAtAndBeam"))
+ if (LLSelectMgr::getInstance()->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
{
- if (LLSelectMgr::getInstance()->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
- {
- LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
- effectp->setPositionGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal() );
- effectp->setColor(LLColor4U(gAgent.getEffectColor()));
- F32 duration = 0.5f;
- duration += LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount() / 64.f;
- effectp->setDuration(duration);
- }
+ LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+ effectp->setPositionGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal() );
+ effectp->setColor(LLColor4U(gAgent.getEffectColor()));
+ F32 duration = 0.5f;
+ duration += LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount() / 64.f;
+ effectp->setDuration(duration);
}
gAgent.setLookAt(LOOKAT_TARGET_CLEAR);
@@ -3155,7 +3149,21 @@ void LLSelectMgr::packDuplicateOnRayHead(void *user_data)
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
- msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID() );
+ LLUUID group_id = gAgent.getGroupID();
+
+ //KC: lets make sure that shift-copied stuff also gets the right group set >_>
+ //MOYMOD 2009-05, If avatar is in land group/land owner group,
+ // it rezzes it with it to prevent autoreturn/whatever...
+ if(gSavedSettings.getBOOL("mm_alwaysRezWithLandGroup")){
+ LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ if(gAgent.isInGroup(parcel->getGroupID())){
+ msg->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
+ }else if(gAgent.isInGroup(parcel->getOwnerID())){
+ msg->addUUIDFast(_PREHASH_GroupID, parcel->getOwnerID());
+ }else msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+ }else msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+
+ msg->addUUIDFast(_PREHASH_GroupID, group_id);
msg->addVector3Fast(_PREHASH_RayStart, data->mRayStartRegion );
msg->addVector3Fast(_PREHASH_RayEnd, data->mRayEndRegion );
msg->addBOOLFast(_PREHASH_BypassRaycast, data->mBypassRaycast );
@@ -3451,6 +3459,17 @@ void LLSelectMgr::deselectAllIfTooFar()
return;
}
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+#ifdef RLV_EXTENSION_CMD_INTERACT
+ // [Fall-back code] Don't allow an active selection (except for HUD attachments - see above) when @interact=n restricted
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))
+ {
+ deselectAll();
+ return;
+ }
+#endif // RLV_EXTENSION_CMD_INTERACT
+// [/RLVa:KB]
+
// HACK: Don't deselect when we're navigating to rate an object's
// owner or creator. JC
if (gPieObject->getVisible() || gPieRate->getVisible() )
@@ -3459,12 +3478,20 @@ void LLSelectMgr::deselectAllIfTooFar()
}
LLVector3d selectionCenter = getSelectionCenterGlobal();
- if (gSavedSettings.getBOOL("LimitSelectDistance")
+
+// if (gSavedSettings.getBOOL("LimitSelectDistance")
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+ BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible();
+ if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) )
+// [/RLVa:KB]
&& (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar())
&& !mSelectedObjects->isAttachment()
&& !selectionCenter.isExactlyZero())
{
- F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
+// F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+ F32 deselect_dist = (!fRlvFartouch) ? gSavedSettings.getF32("MaxSelectDistance") : 1.5f;
+// [/RLVa:KB]
F32 deselect_dist_sq = deselect_dist * deselect_dist;
LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter;
@@ -3919,6 +3946,19 @@ void LLSelectMgr::packAgentAndSessionAndGroupID(void* user_data)
void LLSelectMgr::packDuplicateHeader(void* data)
{
LLUUID group_id(gAgent.getGroupID());
+
+ //KC: lets make sure that shift-copied stuff also gets the right group set >_>
+ //MOYMOD 2009-05, If avatar is in land group/land owner group,
+ // it rezzes it with it to prevent autoreturn/whatever...
+ if(gSavedSettings.getBOOL("mm_alwaysRezWithLandGroup")){
+ LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ if(gAgent.isInGroup(parcel->getGroupID())){
+ group_id = parcel->getGroupID();
+ }else if(gAgent.isInGroup(parcel->getOwnerID())){
+ group_id = parcel->getOwnerID();
+ }
+ }
+
packAgentAndSessionAndGroupID(&group_id);
LLDuplicateData* dup_data = (LLDuplicateData*) data;
@@ -4586,7 +4626,7 @@ void LLSelectMgr::processForceObjectSelect(LLMessageSystem* msg, void**)
//Banana:KC - I'll just put this back so it will work again
void LLSelectMgr::enableSilhouette(BOOL enable)
{
- if(gSavedSettings.getBOOL("AscentRenderHighlightSelections"))
+ if(gSavedSettings.getBOOL("PhoenixRenderHighlightSelections"))
{
mRenderSilhouettes = enable;
}
@@ -4915,11 +4955,8 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
{
LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID();
LLUUID focus_item_id = LLViewerMediaFocus::getInstance()->getSelectedUUID();
-
- // <edit>
- //for (S32 pass = 0; pass < 2; pass++)
- //{
- // </edit>
+ for (S32 pass = 0; pass < 2; pass++)
+ {
for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
iter != mSelectedObjects->end(); iter++)
{
@@ -4955,9 +4992,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
node->renderOneSilhouette(sSilhouetteChildColor);
}
}
- // <edit>
- //}
- // </edit>
+ }
}
if (mHighlightedObjects->getNumNodes())
@@ -5837,10 +5872,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
// Can't select land
if (object->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH) return FALSE;
- // <edit>
- //ESelectType selection_type = getSelectTypeForObject(object);
- //if (mSelectedObjects->getObjectCount() > 0 && mSelectedObjects->mSelectType != selection_type) return FALSE;
- // </edit>
+ ESelectType selection_type = getSelectTypeForObject(object);
+ if (mSelectedObjects->getObjectCount() > 0 && mSelectedObjects->mSelectType != selection_type) return FALSE;
return TRUE;
}
2  indra/newview/llvieweraudio.cpp
View
@@ -68,7 +68,7 @@ void init_audio()
if (!mute_audio && FALSE == gSavedSettings.getBOOL("NoPreload"))
{
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert")));
- gAudiop->preloadSound(LLUUID(gSavedSettings.getString("AscentAvatarAgeAlertSoundUUID")));
+ gAudiop->preloadSound(LLUUID(gSavedSettings.getString("PhoenixAvatarAgeAlertSoundUUID")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatFromObject")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClick")));
4 indra/newview/llviewermenu.cpp
View
@@ -6144,6 +6144,10 @@ class LLShowFloater : public view_listener_t
{
LLFloaterAO::toggle(NULL);
}
+ else if (floater_name == "lua console")
+ {
+ LLFloaterLuaConsole::toggle(NULL);
+ }
return true;
}
};
54 indra/newview/llviewertexteditor.cpp
View
@@ -62,6 +62,10 @@
#include "llappviewer.h" // for gPacificDaylightTime
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
static LLRegisterWidget<LLViewerTextEditor> r("text_editor");
///----------------------------------------------------------------------------
@@ -96,6 +100,14 @@ class LLEmbeddedNotecardOpener : public LLInventoryCallback
}
else
{
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE))
+ {
+ RlvNotifications::notifyBlockedViewNote();
+ return;
+ }
+// [/RLVa:KB]
+
// See if we can bring an existing preview to the front
if(!LLPreview::show(item->getUUID(), true))
{
@@ -1039,10 +1051,6 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
{
switch( cargo_type )
{
- // <edit>
- // This does not even appear to be used maybe
- // Throwing it out so I can embed calling cards
- /*
case DAD_CALLINGCARD:
if(acceptsCallingCardNames())
{
@@ -1059,9 +1067,7 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
*accept = ACCEPT_NO;
}
break;
- */
- case DAD_CALLINGCARD:
- // </edit>
+
case DAD_TEXTURE:
case DAD_SOUND:
case DAD_LANDMARK:
@@ -1074,32 +1080,10 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
case DAD_GESTURE:
{
LLInventoryItem *item = (LLInventoryItem *)cargo_data;
- // <edit>
- /* <LUNA> I don't like this, disabling. - N3X15
- if((item->getPermissions().getMaskOwner() & PERM_ITEM_UNRESTRICTED) != PERM_ITEM_UNRESTRICTED)
- {
- if(gSavedSettings.getBOOL("ForceNotecardDragCargoPermissive"))
- {
- item = new LLInventoryItem((LLInventoryItem *)cargo_data);
- LLPermissions old = item->getPermissions();
- LLPermissions perm;
- perm.init(old.getCreator(), old.getOwner(), old.getLastOwner(), old.getGroup());
- perm.setMaskBase(PERM_ITEM_UNRESTRICTED);
- perm.setMaskEveryone(PERM_ITEM_UNRESTRICTED);
- perm.setMaskGroup(PERM_ITEM_UNRESTRICTED);
- perm.setMaskNext(PERM_ITEM_UNRESTRICTED);
- perm.setMaskOwner(PERM_ITEM_UNRESTRICTED);
- item->setPermissions(perm);
- }
- }
- </LUNA> */
- // </edit>
if( item && allowsEmbeddedItems() )
{
U32 mask_next = item->getPermissions().getMaskNextOwner();
- // <edit>
- //if((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
- if(((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED))// I DOES NOT LIKING THIS, DISABLING || gSavedSettings.getBOOL("ForceNotecardDragCargoAcceptance"))
+ if((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
{
if( drop )
{
@@ -1244,7 +1228,7 @@ std::string LLViewerTextEditor::appendTime(bool prepend_newline)
timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
std::string text;
- if (gSavedSettings.getBOOL("AscentAddSecondsInHistory"))
+ if (gSavedSettings.getBOOL("PhoenixAddSecondsInHistory"))
text = llformat("[%02d:%02d:%02d] ", timep->tm_hour, timep->tm_min, timep->tm_sec);
else
text = llformat("[%02d:%02d] ", timep->tm_hour, timep->tm_min);
@@ -1364,6 +1348,14 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc)
void LLViewerTextEditor::openEmbeddedTexture( LLInventoryItem* item, llwchar wc )
{
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
+ {
+ RlvNotifications::notifyBlockedViewTexture();
+ return;
+ }
+// [/RLVa:KB]
+
// See if we can bring an existing preview to the front
// *NOTE: Just for embedded Texture , we should use getAssetUUID(),
// not getUUID(), because LLPreviewTexture pass in AssetUUID into
2  indra/newview/llviewertexteditor.h
View
@@ -95,7 +95,7 @@ class LLViewerTextEditor : public LLTextEditor
// *HACK: This is only useful because the notecard verifier may
// change the asset if there is embedded inventory. This mechanism
// should be changed to get a different asset id from the verifier
- // rather than checking if a re-load is necessary. Ascent 2007-02-27
+ // rather than checking if a re-load is necessary. Phoenix 2007-02-27
bool hasEmbeddedInventory();
// <edit>
std::vector<LLPointer<LLInventoryItem> > getEmbeddedItems();
42 indra/newview/llvoavatar.cpp
View
@@ -3064,7 +3064,7 @@ void LLVOAvatar::idleUpdateLoadingEffect()
particle_parameters.mPartData.mFlags = ( LLPartData::LL_PART_INTERP_COLOR_MASK | LLPartData::LL_PART_INTERP_SCALE_MASK |
LLPartData::LL_PART_EMISSIVE_MASK | // LLPartData::LL_PART_FOLLOW_SRC_MASK |
LLPartData::LL_PART_TARGET_POS_MASK );
-
+
setParticleSource(particle_parameters, getID());
*/
}
@@ -3413,7 +3413,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
LLColor4 avatar_name_color = (*sAvatarNameColor);
if(!mIsSelf)
resolveClient(avatar_name_color,client, this);
- else if(gSavedSettings.getBOOL("AscentShowOwnClientColor") && LLVOAvatar::sClientResolutionList.has("isComplete") && LLVOAvatar::sClientResolutionList.has(LUNA_CLIENT_TAG))
+ else if(gSavedSettings.getBOOL("PhoenixShowOwnClientColor") && LLVOAvatar::sClientResolutionList.has("isComplete") && LLVOAvatar::sClientResolutionList.has(LUNA_CLIENT_TAG))
{
LLSD cllsd = LLVOAvatar::sClientResolutionList[LUNA_CLIENT_TAG];
LLColor4 colour;
@@ -3427,24 +3427,24 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
avatar_name_color = colour;
}
- static BOOL* sAscentChangeColorOnClient = rebind_llcontrol<BOOL>("AscentChangeColorOnClient", &gSavedSettings, true);
- static BOOL* sAscentClientTagDisplay = rebind_llcontrol<BOOL>("AscentClientTagDisplay", &gSavedSettings, true);
+ static BOOL* sPhoenixChangeColorOnClient = rebind_llcontrol<BOOL>("PhoenixChangeColorOnClient", &gSavedSettings, true);
+ static BOOL* sPhoenixClientTagDisplay = rebind_llcontrol<BOOL>("PhoenixClientTagDisplay", &gSavedSettings, true);
- if(!*sAscentChangeColorOnClient)
+ if(!*sPhoenixChangeColorOnClient)
{
avatar_name_color = (*sAvatarNameColor);
}
- if(!*sAscentClientTagDisplay)
+ if(!*sPhoenixClientTagDisplay)
{
client = "";
}
- //Ascent:KC - color friend's name tags
- static BOOL* sAscentColorFriendsNameTags = rebind_llcontrol<BOOL>("AscentColorFriendsNameTags", &gSavedSettings, true);
- if(*sAscentColorFriendsNameTags && LLAvatarTracker::instance().isBuddy(getID()))
+ //Phoenix:KC - color friend's name tags
+ static BOOL* sPhoenixColorFriendsNameTags = rebind_llcontrol<BOOL>("PhoenixColorFriendsNameTags", &gSavedSettings, true);
+ if(*sPhoenixColorFriendsNameTags && LLAvatarTracker::instance().isBuddy(getID()))
{
- static LLCachedControl<LLColor4> AscentFriendNameColor("AscentFriendNameColor", LLColor4(0.447f, 0.784f, 0.663f, 1.f));
- avatar_name_color = AscentFriendNameColor;
+ static LLCachedControl<LLColor4> PhoenixFriendNameColor("PhoenixFriendNameColor", LLColor4(0.447f, 0.784f, 0.663f, 1.f));
+ avatar_name_color = PhoenixFriendNameColor;
}
avatar_name_color.setAlpha(alpha);
@@ -4633,9 +4633,9 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
if (pass == AVATAR_RENDER_PASS_SINGLE)
{
- static LLCachedControl<BOOL> AscentShowTransparentHidesAlpha("AscentShowTransparentHidesAlpha", 0);
+ static LLCachedControl<BOOL> PhoenixShowTransparentHidesAlpha("PhoenixShowTransparentHidesAlpha", 0);
bool should_alpha_mask;
- if(AscentShowTransparentHidesAlpha)
+ if(PhoenixShowTransparentHidesAlpha)
{
should_alpha_mask = mSupportsAlphaLayers && mHasBakedHair
&& !LLDrawPoolAvatar::sSkipTransparent;
@@ -6708,7 +6708,7 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
if (gAgent.mForceMouselook) gAgent.changeCameraToMouselook();
//Name Short - Revoke permissions for the object you've just sat on.
- U32 state = gSavedSettings.getU32("AscentRevokePerms");
+ U32 state = gSavedSettings.getU32("PhoenixRevokePerms");
if(state == 1 || (state == 3 && !sit_object->permYouOwner()))
{
gMessageSystem->newMessageFast(_PREHASH_RevokePermissions);
@@ -6796,7 +6796,7 @@ void LLVOAvatar::getOffObject()
gAgent.setSitCamera(LLUUID::null);
//Name Short - Revoke permissions for the object you've just stood up from.
- U32 state = gSavedSettings.getU32("AscentRevokePerms");
+ U32 state = gSavedSettings.getU32("PhoenixRevokePerms");
if(state == 2 || (state == 3 && !sit_object->permYouOwner()))
{
gMessageSystem->newMessageFast(_PREHASH_RevokePermissions);
@@ -8595,7 +8595,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
for( S32 i = 0; i < num_blocks; i++ )
{
- while( param && (!param->isTweakable()) )
+ while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) ) // should not be any of group VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
{
param = getNextVisualParam();
}
@@ -8634,7 +8634,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
}
}
- while( param && (!param->isTweakable()) )
+ while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) ) // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
{
param = getNextVisualParam();
}
@@ -8720,7 +8720,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerImage *src_vi,
{
if (!aux_src->getData())
{
- llerrs << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl;
+ //llerrs << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl;
return;
}
@@ -8786,7 +8786,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerImage *src_vi,
}
else
{
- // this can happen when someone uses an old baked texture possibly provided by
+ // this can happen when someone uses an old baked texture possibly provided by
// viewer-side baked texture caching
llwarns << "Masks loaded callback but NO aux source!" << llendl;
}
@@ -8912,8 +8912,8 @@ void LLVOAvatar::dumpArchetypeXML( void* )
for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() )
{
LLViewerVisualParam* viewer_param = (LLViewerVisualParam*)param;
- if( (viewer_param->getWearableType() == type) &&
- (viewer_param->isTweakable() ) )
+ if( (viewer_param->getWearableType() == type) &&
+ (param->isTweakable()) )
{
apr_file_printf( file, "\t\t<param id=\"%d\" name=\"%s\" value=\"%.3f\"/>\n",
viewer_param->getID(), viewer_param->getName().c_str(), viewer_param->getWeight() );
2  indra/newview/llvoavatar.h
View
@@ -245,7 +245,7 @@ class LLVOAvatar :
void addChat(const LLChat& chat);
void clearChat();
- void startTyping() { mTyping = TRUE; mTypingTimer.reset(); mIdleTimer.reset();}
+ void startTyping() { mTyping = TRUE; mTypingTimer.reset(); mIdleTimer.reset(); }
void stopTyping() { mTyping = FALSE; }
bool isTyping() { return mTyping; }
20 indra/newview/lua/HookDocs.lua
View
@@ -4,10 +4,10 @@
-- defined in indra/newview/llfloaterbump.cpp:165
RegisterHook("OnBump", "You were bumped by something")
--- defined in indra/newview/llviewermessage.cpp:2937
+-- defined in indra/newview/llviewermessage.cpp:3390
RegisterHook("OnChatDebug", "Triggered when an object states something on the debug channel.")
--- defined in indra/newview/llagent.cpp:988
+-- defined in indra/newview/llagent.cpp:987
RegisterHook("OnRegionChanged", "Tells Lua that you have moved into a new region.")
-- defined in indra/newview/llviewerwindow.cpp:815
@@ -16,7 +16,7 @@ RegisterHook("OnLeftMouseUp", "Left mouse button is UP.")
-- defined in indra/newview/llvoavatar.cpp:3038
RegisterHook("OnAvatarLoading", "Trigger loading effect plugin :V")
--- defined in indra/newview/llviewermessage.cpp:2958
+-- defined in indra/newview/llviewermessage.cpp:3411
RegisterHook("OnChatUnknown", "Triggered when someone uses an unknown chat method.")
-- defined in indra/newview/llviewerobjectlist.cpp:1402
@@ -46,10 +46,10 @@ RegisterHook("OnLunaInit", "Luna's Lua engine has initialized.")
-- defined in indra/newview/llviewerwindow.cpp:730
RegisterHook("OnDoubleClick", "Right mouse button is DOWN.")
--- defined in indra/newview/llviewermessage.cpp:2916
+-- defined in indra/newview/llviewermessage.cpp:3281
RegisterHook("OnChatWhisper", "Triggered when someone whispers something in local chat")
--- defined in indra/newview/llagent.cpp:510
+-- defined in indra/newview/llagent.cpp:509
RegisterHook("OnAgentInit", "On login, tells the Lua engine the name of the user and whether it's a Linden or not.")
-- defined in indra/newview/llviewerwindow.cpp:1024
@@ -61,7 +61,7 @@ RegisterHook("OnAssetDownloaded", "Asset successfully downloaded.")
-- defined in indra/newview/llviewerwindow.cpp:1205
RegisterHook("OnWindowResized", "Window was resized.")
--- defined in indra/newview/llviewermessage.cpp:2932
+-- defined in indra/newview/llviewermessage.cpp:3385
RegisterHook("OnChatSay", "Triggered when an object uses llOwnerSay.")
-- defined in indra/newview/LuaInventory_f.cpp:267
@@ -70,7 +70,7 @@ RegisterHook("OnAssetFailed", "Asset failed to download or decode.")
-- defined in indra/newview/llviewerwindow.cpp:911
RegisterHook("OnRightMouseDown", "Right mouse button is DOWN.")
--- defined in indra/newview/llviewermessage.cpp:4046
+-- defined in indra/newview/llviewermessage.cpp:4532
RegisterHook("OnSoundTriggered", "Triggered when a sound is triggered.")
-- defined in indra/newview/llvoavatar.cpp:3033
@@ -79,10 +79,10 @@ RegisterHook("OnAvatarLoaded", "Triggered when an avatar has been fully loaded."
-- defined in indra/newview/llviewerobject.cpp:1014
RegisterHook("OnSetText", "Someone set this object's llSetText.")
--- defined in indra/newview/llagent.cpp:853
+-- defined in indra/newview/llagent.cpp:852
RegisterHook("OnPhantom", "Tells the script engine whether a user has become phantom.")
--- defined in indra/newview/llviewermessage.cpp:2950
+-- defined in indra/newview/llviewermessage.cpp:3403
RegisterHook("OnChatShout", "Triggered when someone shouts something in local chat.")
-- defined in indra/newview/llviewerwindow.cpp:621
@@ -91,7 +91,7 @@ RegisterHook("OnLeftMouseDown", "Left mouse button is DOWN.")
-- defined in indra/newview/llvoavatar.cpp:6503
RegisterHook("OnAttach", "Object UUID has attached to avatar Name.")
--- defined in indra/newview/llviewermessage.cpp:2926
+-- defined in indra/newview/llviewermessage.cpp:3379
RegisterHook("OnBridgeCommand", "Triggered when an object tries to communicate via the debug channel or the llOwnerSay channel using a command prefixed with &FLEXLIFE;")
-- defined in indra/newview/llviewerwindow.cpp:1128
3  indra/newview/lua/Hooks/AO/ZHAOParser.lua
View
@@ -76,7 +76,8 @@ function ZHAOParser:CanParse(data)
tmp:write(data)
tmp:flush()
for line in tmp:lines() do
- if string.starts(line,"[ Stands ]") then
+ print("[AO] "..line)
+ if string.starts(line,"[ Stands ]") or string.starts(line,"[ Standing ]") then
tmp:close()
return true
end
7 indra/newview/lua/Hooks/AO/_init_.lua
View
@@ -285,9 +285,9 @@ end
-- EVENT HANDLING --
------------------------------------------------------------------------------------------------------------------
local function AO_OnAONotecard(id)
- -- Download the notecard and decode it.
- print ("[AO] Downloading notecard.")
+ -- Download the notecard and decode it
AO.NotecardRequestKey=requestInventoryAsset(id,UUID_null)
+ print ("[AO] Downloading notecard. (reqid: "..AO.NotecardRequestKey..")")
end
local function AO_OnAssetFailed(transfer_key)
@@ -299,6 +299,9 @@ end
local function AO_OnAssetDownloaded(transfer_key,typ,data)
if AO.NotecardRequestKey == transfer_key then
+ f = io.open("_NotecardDump.txt","w")
+ f:write(data)
+ f:close()
AO.NotecardRequestKey=nil
print("[AO] Notecard successfully downloaded! Attempting to parse...")
AO:DetectNotecardType(data)
BIN  indra/newview/skins/default/textures/Inv_WaterLight.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  indra/newview/skins/default/textures/Inv_WindLight.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  indra/newview/skins/default/textures/arrow_left.tga
View
Binary file not shown
BIN  indra/newview/skins/default/textures/arrow_right.tga
View
Binary file not shown
7 indra/newview/skins/default/textures/textures.xml
View
@@ -368,6 +368,9 @@
<texture name="icn_label_music.tga"/>
<texture name="icn_label_media.tga"/>
<texture name="arrow_down.tga"/>
+ <texture name="arrow_up.tga"/>
+ <texture name="arrow_left.tga"/>
+ <texture name="arrow_right.tga"/>
<texture name="cloud-particle.j2c" use_mips="true"/>
<texture name="skin_thumbnail_default.png" preload="true" />
@@ -399,5 +402,7 @@
<texture name="media_btn_scrollup.png"/>
<texture name="media_btn_stoploading.png"/>
<texture name="media_panel_divider.png"/>
-
+ <!-- Kitty Viewer Art -->
+ <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" />
+ <texture name="Inv_WaterLight" file_name="Inv_WaterLight.png" preload="false" />
</textures>
14 indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
View
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
- height="300" min_height="200" min_width="180" name="active_speakers"
+ height="300" min_height="140" min_width="140" name="active_speakers"
rect_control="FloaterActiveSpeakersRect" title="Active Speakers"
width="250">
<panel bottom="0" follows="left|top|right|bottom" left="0" mouse_opaque="false"
name="active_speakers_panel" right="250" top="300">
- <scroll_list bottom="35" can_resize="true" column_padding="0" draw_heading="true"
- draw_stripes="false" follows="left|top|bottom|right" left="10"
- multi_select="false" name="speakers_list" right="-10" search_column="1"
+ <scroll_list bottom="25" can_resize="true" column_padding="0" draw_heading="true"
+ draw_stripes="false" follows="left|top|bottom|right" left="5"
+ multi_select="false" name="speakers_list" right="-5" search_column="1"
sort_column="2" top="-20">
<column name="icon_speaking_status" sort="speaking_status" width="20" />
<column dynamicwidth="true" label="Name" name="speaker_name" />
@@ -15,13 +15,13 @@
</scroll_list>
<panel background_opaque="false" background_visible="false" bevel_style="in"
bg_alpha_color="0,0,0,0" bg_opaque_color="0,0,0,0.3" border="false"
- bottom="5" can_resize="false" follows="left|right|bottom" height="20"
- left="10" mouse_opaque="true" name="volume_container" right="-10">
+ bottom="0" can_resize="false" follows="left|right|bottom" height="20"
+ left="0" mouse_opaque="true" name="volume_container" right="-10">
<volume_slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
left_delta="10" max_val="1.0" min_val="0.0" name="speaker_volume"
width="110" />
<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
- image_unselected="icn_speaker_dark.tga" label="" left_delta="115"
+ image_unselected="icn_speaker_dark.tga" label="" left_delta="110"
name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
width="25" />
</panel>
22 indra/newview/skins/default/xui/en-us/floater_alertwindow.xml
View
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="false" can_close="true" can_minimize="true" bottom="400" left="300" can_resize="false" height="250" name="AscentAlertWindow" title="Ascent - Keywords Alert" width="325">
+<floater border="false" can_close="true" can_minimize="true" bottom="400" left="300" can_resize="false" height="250" name="PhoenixAlertWindow" title="Phoenix - Keywords Alert" width="325">
<check_box bottom_delta="-40" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="If any of the phrases (separated by commas) listed here" left="5" mouse_opaque="true"
- name="AscentKeywords_Alert" radio_style="false" width="270"/>
+ name="PhoenixKeywords_Alert" radio_style="false" width="270"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
- font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="AscentKeywords_Entries" width="300" />
+ font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="PhoenixKeywords_Entries" width="300" />
<text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="20" left_delta="15" name="EmKeyw"
width="100">Is found within:</text>
<check_box bottom_delta="3" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
- label="Instant Message Floater" left_delta="100" mouse_opaque="true" name="AscentKeywords_IM" radio_style="false" width="270"/>
+ label="Instant Message Floater" left_delta="100" mouse_opaque="true" name="PhoenixKeywords_IM" radio_style="false" width="270"/>
<check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
- label="Local Chat Floater" left_delta="0" mouse_opaque="true" name="AscentKeywords_LocalChat" radio_style="false" width="270"/>
+ label="Local Chat Floater" left_delta="0" mouse_opaque="true" name="PhoenixKeywords_LocalChat" radio_style="false" width="270"/>
<check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
- label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="AscentKeywords_Highlight"
+ label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="PhoenixKeywords_Highlight"
radio_style="false" width="270"/>
<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-15" can_apply_immediately="true"
color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210"
- mouse_opaque="true" name="AscentKeywords_Color" tool_tip="Click to open Color Picker" width="50"/>
+ mouse_opaque="true" name="PhoenixKeywords_Color" tool_tip="Click to open Color Picker" width="50"/>
<check_box bottom_delta="-10" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
- label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="AscentKeywords_PlaySound"
+ label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="PhoenixKeywords_PlaySound"
radio_style="false" width="270"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
- font="SansSerifSmall" height="20" left_delta="0" max_length="36" mouse_opaque="true" name="AscentKeywords_SoundUUID" width="300" />
+ font="SansSerifSmall" height="20" left_delta="0" max_length="36" mouse_opaque="true" name="PhoenixKeywords_SoundUUID" width="300" />
<button bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="22" label="Save" left="75"
- mouse_opaque="true" name="AscentKeywords_save" scale_image="true" width="85" />
+ mouse_opaque="true" name="PhoenixKeywords_save" scale_image="true" width="85" />
<button bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
halign="center" height="22" label="Cancel" left_delta="90"
- mouse_opaque="true" name="AscentKeywords_cancel" scale_image="true" width="85" />
+ mouse_opaque="true" name="PhoenixKeywords_cancel" scale_image="true" width="85" />
</floater>
9 indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false"
- can_resize="false" height="556" min_height="256" min_width="300"
+ can_resize="false" height="320" min_height="320" min_width="300"
name="Animation Preview" title="" width="300">
<pad height="12" />
<text follows="top|left" height="15" left="10" name="name_label">
@@ -16,7 +16,7 @@
max_length="254" name="description_form" right="-10" />
<pad height="0" />
<spinner decimal_digits="0" follows="left|top" height="18" increment="1" initial_val="0"
- label="Priority" label_width="50" left="10" max_val="5" min_val="0"
+ label="Priority" label_width="50" left="10" max_val="4" min_val="0"
name="priority"
tool_tip="Controls which other animations can be overridden by this animation."
width="90" />
@@ -180,7 +180,7 @@
<slider bottom_delta="0" follows="top|right" height="20" increment="0.0001"
initial_val="0" label="" label_width="0" left="80" max_val="1" min_val="0"
name="playback_slider" right="290" show_text="false" />
- <text bottom="280" follows="top|left" left="20" name="bad_animation_text">
+ <text bottom="250" follows="top|left" left="10" name="bad_animation_text">
Unable to read animation file.
We recommend BVH files exported from Poser 4.
@@ -202,7 +202,4 @@ Maximum animation length is [MAX_LENGTH] seconds.
[STATUS]
</string>
- <string name="in_world">
- The animation preview is played on your avatar.
- </string>
</floater>
422 indra/newview/skins/default/xui/en-us/floater_ao.xml
View
@@ -1,101 +1,323 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
- width="305" height="590" min_width="275" min_height="400"
- name="AO Editor" title="AO Editor" rect_control="FloaterAORect">
- <text follows="top|left" height="15" left="10" name="text_stand1" bottom="-40">
- Action:
- </text>
- <combo_box name="combo_anim_type" max_length="36" allow_text_entry="true" follows="top||left|right" height="20" left="75" right="-7" bottom_delta="0">
- <combo_item type="string" length="1" enabled="true" name="Crouch" value="201f3fdf-cb1f-dbec-201f-7333e328ae7c">
- Crouch
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Crouchwalk" value="47f5f6fb-22e5-ae44-f871-73aaaf4a6022">
- Crouchwalk
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Fall" value="666307d9-a860-572d-6fd4-c3ab8865c094">
- Fall
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Fly" value="aec4610c-757f-bc4e-c092-c6e9caf18daf">
- Fly
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="FlyDown" value="20f063ea-8306-2562-0b07-5c853b37b31e">
- Fly Down
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="FlyUp" value="62c5de58-cb33-5743-3d07-9e4cd4352864">
- Fly Up
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="GroundSit" value="1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e">
- Ground Sit
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Hover" value="4ae8016b-31b9-03bb-c401-b1ea941db41d">
- Hover
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="SoftLand" value="7a17b059-12b2-41b1-570a-186368b6aa6f">
- Land (Soft)
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="MediumLand" value="f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57">
- Land (Medium)
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="HardLand" value="3da1d753-028a-5446-24f3-9c9b856d9422">
- Land (Hard)
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Jump" value="2305bd75-1ca9-b03b-1faa-b176b8a8c49e">
- Jump
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="PreJump" value="7a4e87fe-de39-6fcb-6223-024b00893244">
- Pre-Jump
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Run" value="05ddbff8-aaa9-92a1-2b74-8fe77a29b445">
- Run
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Sit" value="1a5fe8ac-a804-8a5d-7cbd-56bd83184568">
- Sit
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="SlowFly" value="2b5a38b2-5e00-3a97-a495-4c826bc443e6">
- Slow Fly
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Stand" value="Stands">
- Stand
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Stride" value="1cb562b0-ba21-2202-efb3-30f82cdf9595">
- Stride
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="TurnLeft" value="56e0ba0d-4a9f-7f27-6117-32f2ebbf6135">
- Turn Left
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="TurnRight" value="2d6daa51-3192-6794-8e2e-a15f8338ec30">
- Turn Right
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Type" value="c541c47f-e0c0-058b-ad1a-d6ae3a4584d9">
- Typing
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Voice" value="Voices">
- Voice
- </combo_item>
- <combo_item type="string" length="1" enabled="true" name="Walk" value="6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0">
- Walk
- </combo_item>
- </combo_box>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ name="PhoenixAOfloater"
+ rect_control="PhoenixAORect"
+ title="Animation Overrider"
+ can_resize="false"
+ can_minimize="true"
+ can_close="true"
+ can_drag_on_left="false"
+ width="610"
+ height="460">
- <text follows="top|left" height="15" left="10" name="text_walking" bottom_delta="-25">
- Animations:
- </text>
- <combo_box name="combo_anim_list" max_length="36" allow_text_entry="true" follows="top|left|right" height="20" left="75" right="-52" bottom_delta="0">
- </combo_box>
- <button follows="top|right" bottom_delta="0" height="20" label="+" right="-29" name="combo_anim_add" width="21" />
- <button follows="top|right" bottom_delta="0" height="20" label="-" right="-7" name="combo_anim_delete" width="21" />
- <text follows="top|left" height="15" left="10" name="text_running" bottom_delta="-25">
- Current List:
- </text>
- <scroll_list bottom="35" can_resize="true" column_padding="0" draw_heading="true"
- follows="left|top|bottom|right" left="7" multi_select="true" right="-7"
- name="active_anim_list" width="280" search_column="1"
- tool_tip="Hold shift or control while clicking to select multiple files"
- top="-68">
- <column dynamicwidth="true" label="Animation" name="anim_name" tool_tip="Name of the animation." />
- </scroll_list>
- <button follows="right|bottom" bottom="7" halign="center" height="24" label="Load..."
- left="120" name="btn_load" width="80" />
- <button follows="right|bottom" bottom="7" halign="center" height="24" label="Save..."
- left_delta="90" name="btn_save" width="80" />
-</floater>
+ <view_border blevel_style="in" border_thickness="0" bottom="-460" follows="left|top" height="460" left="1"
+ mouse_opaque="false" name="ao_notecard" width="610" />
+ <view_border blevel_style="in" bottom="420" follows="left|top" height="16" left="10"
+ mouse_opaque="false" name="ao_notecard_vis" width="180" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+ font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
+ mouse_opaque="true" name="Give inventory"
+ tool_tip="Drop a ZHAO notecard here. Animations have to be in the same Inventory folder as the notecard." v_pad="2"
+ width="180">
+ Drop a ZHAO II Notecard here.
+ </text>
+ <view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="0"
+ mouse_opaque="false" name="ao_notecard_disp" width="180" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+ font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
+ mouse_opaque="true" name="ao_nc_text"
+ tool_tip="" v_pad="2"
+ width="180">
+ Currently set to: ITEM
+ </text>
+
+ <button
+ name="opencard"
+ label="Open"
+ font="SansSerifSmall"
+ left="10"
+ bottom_delta="-30"
+ width="58"
+ height="20"
+ follows="left|top"
+ />
+ <button
+ name="reloadcard"
+ label="Reload"
+ font="SansSerifSmall"
+ left="70"
+ bottom_delta="0"
+ width="58"
+ height="20"
+ follows="left|top"
+ />
+ <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+ height="20" label="More &gt;&gt;" left="130"
+ mouse_opaque="true" name="more_btn" scale_image="TRUE"
+ tool_tip="Advanced Options" width="58" />
+ <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+ height="20" label="&lt;&lt; Less" left_delta="0"
+ mouse_opaque="true" name="less_btn" scale_image="TRUE"
+ tool_tip="Advanced Options" width="58" />
+
+
+ <check_box bottom_delta="-42" control_name="PhoenixAOEnabled" enabled="true"
+ follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Override Anims" left="10"
+ mouse_opaque="true" name="PhoenixAOEnabled" radio_style="false" width="90" />
+ <check_box bottom_delta="0" control_name="PhoenixAOSitsEnabled" enabled="true"
+ follows="left|top" font="SansSerifSmall" height="16" initial_value="true" label="Override Sits" left="110"
+ mouse_opaque="true" name="PhoenixAOSitsEnabled" radio_style="false" width="90" />
+
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="buttons_desc" v_pad="0" width="180">
+ Stands:
+ </text>
+ <combo_box name="stand" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="-20"/>
+ <button
+ name="prevstand"
+ tool_tip="previous stand"
+ label="&lt;&lt;"
+ font="SansSerifSmall"
+ left="10"
+ bottom_delta="-25"
+ width="90"
+ height="20"
+ follows="top|left"
+ />
+ <button
+ name="nextstand"
+ tool_tip="next stand"
+ label="&gt;&gt;"
+ font="SansSerifSmall"
+ left="100"
+ bottom_delta="0"
+ width="90"
+ height="20"
+ follows="top|left"
+ />
+ <check_box bottom_delta="-20" control_name="PhoenixAOStandCycling" enabled="true"
+ follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Cycle Stands" left="10"
+ mouse_opaque="true" name="PhoenixAOStandCycling" radio_style="false" width="200" />
+ <check_box bottom_delta="-20" control_name="PhoenixAORandomizestand" enabled="true"
+ follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Randomize Stand Cycling" left="10"
+ mouse_opaque="true" name="PhoenixAORandomizestand" radio_style="false" width="200" />
+ <check_box bottom_delta="-20" control_name="PhoenixAONoStandsInMouselook" enabled="true"
+ follows="left|top" font="SansSerifSmall" height="16" initial_value="true" label="Disable Stands in Mouselook" left="10"
+ mouse_opaque="true" name="PhoenixAONoStandsInMouselook" radio_style="false" width="180" />
+ <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16" control_name="PhoenixAOStandInterval"
+ increment="1" initial_val="20" left="10" max_val="9000" min_val="1.00"
+ mouse_opaque="true" name="standtime" label="Stand Time" label_width="80"
+ tool_tip="AO Stand Time in seconds" width="180" />
+
+ <tab_container label="Default" bottom="18" left="210" mouse_opaque="false" name="tabcontainer" tab_min_width="50" tab_position="top" width="390" height="350" bg_opaque_color="0,0,0,0.0">
+ <panel border="true" left="0" bottom="0" follows="left|top|right|bottom" height="350" label="Basic" mouse_opaque="true" name="tabdefaultanims" width="390">
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="130"
+ mouse_opaque="true" name="randomize" v_pad="0" width="80" tool_tip="Randomize">
+ Randomize
+ </text>
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="0" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultwalk" v_pad="0" width="180">
+ Default Walk:
+ </text>
+ <combo_box name="walk" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizewalk" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultrun" v_pad="0" width="180">
+ Default Run:
+ </text>
+ <combo_box name="run" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizerun" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultprejump" v_pad="0" width="180">
+ Default Pre-Jump:
+ </text>
+ <combo_box name="prejump" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizeprejump" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultjump" v_pad="0" width="180">
+ Default Jump:
+ </text>
+ <combo_box name="jump" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizejump" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultsit" v_pad="0" width="180">
+ Default Sit:
+ </text>
+ <combo_box name="sit" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizesit" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultgsit" v_pad="0" width="180">
+ Default Groundsit:
+ </text>
+ <combo_box name="gsit" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizegsit" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultcrouch" v_pad="0" width="180">
+ Default Crouch:
+ </text>
+ <combo_box name="crouch" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizecrouch" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+ mouse_opaque="true" name="textdefaultcrouchwalk" v_pad="0" width="180">
+ Default Crouchwalk:
+ </text>
+ <combo_box name="cwalk" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizecwalk" radio_style="false" width="20" />
+
+
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="280" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="320"
+ mouse_opaque="true" name="randomize" v_pad="0" width="80" tool_tip="Randomize">
+ Randomize
+ </text>
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="0" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+ mouse_opaque="true" name="textdefaultfall" v_pad="0" width="180">
+ Default Fall:
+ </text>
+ <combo_box name="fall" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizefall" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+ mouse_opaque="true" name="textdefaulthover" v_pad="0" width="180">
+ Default Hover:
+ </text>
+ <combo_box name="hover" label="" follows="left|top" height="20" left_delta="0" width="160" bottom_delta="0"/>
+ <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" left_delta="164" mouse_opaque="true" name="PhoenixAORandomizehover" radio_style="false" width="20" />
+ <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+ bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
+ font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+ mouse_opaque="true" name="textdefaultfly" v_pad="0" width="180">
+ Default Fly: