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

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-21 11:25:10 +01:00
parent 4cd2de0fff dc106c5442
commit 18816ae146
415 changed files with 20229 additions and 16924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
indra/newview/llviewermenu.cpp
View File

@@ -273,7 +273,7 @@
#include "hippogridmanager.h"
using namespace LLOldEvents;
using namespace LLVOAvatarDefines;
using namespace LLAvatarAppearanceDefines;
void init_client_menu(LLMenuGL* menu);
void init_server_menu(LLMenuGL* menu);
@@ -618,6 +618,9 @@ BOOL enable_region_owner(void*);
void menu_toggle_attached_lights(void* user_data);
void menu_toggle_attached_particles(void* user_data);
BOOL enable_dump_archetype_xm(void*);
void handle_dump_archetype_xml(void *);
class LLMenuParcelObserver : public LLParcelObserver
{
public:
@@ -1623,7 +1626,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
&gAllowIdleAFK));
sub_menu->addChild(new LLMenuItemCallGL("Appearance To XML",
&LLVOAvatar::dumpArchetypeXML));
&handle_dump_archetype_xml,&enable_dump_archetype_xm));
// HACK for easy testing of avatar geometry
sub_menu->addChild(new LLMenuItemCallGL( "Toggle Character Geometry",
@@ -2314,13 +2317,13 @@ class LLAvatarReloadTextures : public view_listener_t
{
LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(avatar->getID());
LLTextureReloader texture_list;
for (U32 i = 0; i < LLVOAvatarDefines::TEX_NUM_INDICES; ++i)
for (U32 i = 0; i < LLAvatarAppearanceDefines::TEX_NUM_INDICES; ++i)
{
if (LLVOAvatar::isIndexLocalTexture((ETextureIndex)i))
{
if(avatar->isSelf())
{
LLWearableType::EType wearable_type = LLVOAvatarDictionary::getTEWearableType((ETextureIndex)i);
LLWearableType::EType wearable_type = LLAvatarAppearanceDictionary::getTEWearableType((ETextureIndex)i);
U32 num_wearables = gAgentWearables.getWearableCount(wearable_type);
for (U32 wearable_index = 0; wearable_index < num_wearables; wearable_index++)
{
@@ -2491,7 +2494,7 @@ class LLSelfRemoveAllAttachments : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
LLAgentWearables::userRemoveAllAttachments();
LLAppearanceMgr::instance().removeAllAttachmentsFromAvatar();
return true;
}
};
@@ -4220,14 +4223,14 @@ void handle_show_newest_map(void*)
//
// Major mode switching
//
void reset_view_final( BOOL proceed );
void reset_view_final( BOOL proceed);
void handle_reset_view()
{
if( (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode()) && gFloaterCustomize )
if(gAgentCamera.cameraCustomizeAvatar() && LLFloaterCustomize::instanceExists())
{
// Show dialog box if needed.
gFloaterCustomize->askToSaveIfDirty( boost::bind(&reset_view_final, _1) );
LLFloaterCustomize::getInstance()->askToSaveIfDirty( boost::bind(&reset_view_final, _1) );
}
else
{
@@ -4245,7 +4248,7 @@ class LLViewResetView : public view_listener_t
};
// Note: extra parameters allow this function to be called from dialog.
void reset_view_final( BOOL proceed )
void reset_view_final( BOOL proceed)
{
if( !proceed )
{
@@ -4255,6 +4258,10 @@ void reset_view_final( BOOL proceed )
gAgentCamera.switchCameraPreset(CAMERA_PRESET_REAR_VIEW);
gAgentCamera.resetView(TRUE, TRUE);
gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR);
if(gAgentCamera.cameraCustomizeAvatar() && LLFloaterCustomize::instanceExists())
LLFloaterCustomize::getInstance()->close();
}
class LLViewLookAtLastChatter : public view_listener_t
@@ -4544,6 +4551,22 @@ void handle_god_request_havok(void *)
// }
//}
BOOL enable_dump_archetype_xm(void*)
{
return gSavedSettings.getBOOL("DebugAvatarAppearanceMessage");
}
void handle_dump_archetype_xml(void *)
{
std::string emptyname;
LLVOAvatar* avatar =
find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if (!avatar)
{
avatar = gAgentAvatarp;
}
avatar->dumpArchetypeXML(emptyname);
};
// HACK for easily testing new avatar geometry
void handle_god_request_avatar_geometry(void *)
@@ -6513,7 +6536,7 @@ class LLShowFloater : public view_listener_t
{
if (gAgentWearables.areWearablesLoaded())
{
gAgentCamera.changeCameraToCustomizeAvatar();
LLFloaterCustomize::show();
}
}
else if (floater_name == "outfit")
@@ -7146,6 +7169,7 @@ class LLAttachmentDrop : public view_listener_t
// called from avatar pie menu
void handle_detach_from_avatar(void* user_data)
{
uuid_vec_t ids_to_remove;
const LLViewerJointAttachment *attachment = (LLViewerJointAttachment*)user_data;
// if (attachment->getNumObjects() > 0)
@@ -7153,11 +7177,6 @@ void handle_detach_from_avatar(void* user_data)
if ( (attachment->getNumObjects() > 0) && ((!rlv_handler_t::isEnabled()) || (gRlvAttachmentLocks.canDetach(attachment))) )
// [/RLVa:KB]
{
gMessageSystem->newMessage("ObjectDetach");
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
for (LLViewerJointAttachment::attachedobjs_vec_t::const_iterator iter = attachment->mAttachedObjects.begin();
iter != attachment->mAttachedObjects.end();
iter++)
@@ -7167,12 +7186,14 @@ void handle_detach_from_avatar(void* user_data)
if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(attached_object)) )
continue;
// [/RLVa:KB]
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, attached_object->getLocalID());
ids_to_remove.push_back(attached_object->getAttachmentItemID());
}
if (!ids_to_remove.empty())
{
LLAppearanceMgr::instance().removeItemsFromAvatar(ids_to_remove);
}
gMessageSystem->sendReliable( gAgent.getRegionHost() );
}
}
};
void attach_label(std::string& label, void* user_data)
{
@@ -7270,17 +7291,8 @@ class LLAttachmentDetach : public view_listener_t
}
// [/RLVa:KB]
// The sendDetach() method works on the list of selected
// objects. Thus we need to clear the list, make sure it only
// contains the object the user clicked, send the message,
// then clear the list.
// We use deselectAll to update the simulator's notion of what's
// selected, and removeAll just to change things locally.
//RN: I thought it was more useful to detach everything that was selected
if (LLSelectMgr::getInstance()->getSelection()->isAttachment())
{
LLSelectMgr::getInstance()->sendDetach();
}
LLAppearanceMgr::instance().removeItemFromAvatar(object->getAttachmentItemID());
return true;
}
};
@@ -8419,18 +8431,18 @@ void init_meshes_and_morphs_menu()
menu->addChild(new LLMenuItemCallGL("Dump Avatar Mesh Info", &LLPolyMesh::dumpDiagInfo));
menu->addSeparator();
LLVOAvatar::mesh_info_t mesh_info;
LLVOAvatar::getMeshInfo(&mesh_info);
LLAvatarAppearance::mesh_info_t mesh_info;
LLAvatarAppearance::getMeshInfo(&mesh_info);
for(LLVOAvatarSelf::mesh_info_t::iterator info_iter = mesh_info.begin();
for(LLAvatarAppearance::mesh_info_t::iterator info_iter = mesh_info.begin();
info_iter != mesh_info.end(); ++info_iter)
{
const std::string& type = info_iter->first;
LLVOAvatar::lod_mesh_map_t& lod_mesh = info_iter->second;
LLAvatarAppearance::lod_mesh_map_t& lod_mesh = info_iter->second;
LLMenuGL* type_menu = new LLMenuGL(type);
for(LLVOAvatar::lod_mesh_map_t::iterator lod_iter = lod_mesh.begin();
for(LLAvatarAppearance::lod_mesh_map_t::iterator lod_iter = lod_mesh.begin();
lod_iter != lod_mesh.end(); ++lod_iter)
{
S32 lod = lod_iter->first;
@@ -9061,6 +9073,10 @@ void handle_rebake_textures(void*)
// Slam pending upload count to "unstick" things
bool slam_for_debug = true;
gAgentAvatarp->forceBakeAllTextures(slam_for_debug);
if (gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion())
{
LLAppearanceMgr::instance().requestServerAppearanceUpdate();
}
}
void toggle_visibility(void* user_data)
@@ -9198,7 +9214,7 @@ class LLEditTakeOff : public view_listener_t
{
std::string clothing = userdata.asString();
if (clothing == "all")
LLWearableBridge::removeAllClothesFromAvatar();
LLAppearanceMgr::instance().removeAllClothesFromAvatar();
else
{
LLWearableType::EType type = LLWearableType::typeNameToType(clothing);
@@ -9215,7 +9231,7 @@ class LLEditTakeOff : public view_listener_t
// We'll use the first wearable we come across that can be removed (moving from top to bottom)
for (; wearable_index >= 0; wearable_index--)
{
const LLWearable* pWearable = gAgentWearables.getWearable(type, wearable_index);
const LLViewerWearable* pWearable = gAgentWearables.getViewerWearable(type, wearable_index);
if (!gRlvWearableLocks.isLockedWearable(pWearable))
break;
}
@@ -9223,9 +9239,8 @@ class LLEditTakeOff : public view_listener_t
return true; // No wearable found that can be removed
}
// [/RLVa:KB]
LLViewerInventoryItem *item = dynamic_cast<LLViewerInventoryItem*>(gAgentWearables.getWearableInventoryItem(type,wearable_index));
LLWearableBridge::removeItemFromAvatar(item);
LLUUID item_id = gAgentWearables.getWearableItemID(type,wearable_index);
LLAppearanceMgr::instance().removeItemFromAvatar(item_id);
}
}
return true;