Permalink
Browse files

Merge branch 'master' of https://github.com/Lirusaito/SingularityView…

  • Loading branch information...
Shyotl committed Jun 4, 2016
2 parents 4f4a6d4 + 5adc705 commit 0773f290cd279dddb9b19e7c6314e53609210f35
Showing with 551 additions and 281 deletions.
  1. +13 −0 indra/llappearance/llavatarappearance.cpp
  2. +1 −1 indra/llappearance/llpolymesh.cpp
  3. +1 −0 indra/llappearance/lltexglobalcolor.cpp
  4. +0 −2 indra/llappearance/llwearabledata.cpp
  5. +1 −1 indra/llappearance/llwearabletype.cpp
  6. +14 −20 indra/llcommon/indra_constants.h
  7. +0 −1 indra/llmessage/aihttptimeoutpolicy.cpp
  8. +188 −0 indra/newview/app_settings/settings_ascent.xml
  9. +18 −14 indra/newview/chatbar_as_cmdline.cpp
  10. +23 −14 indra/newview/hippolimits.cpp
  11. +1 −0 indra/newview/hippolimits.h
  12. +112 −49 indra/newview/llagent.cpp
  13. +28 −19 indra/newview/llagent.h
  14. +32 −23 indra/newview/llagentcamera.cpp
  15. +7 −4 indra/newview/llagentcamera.h
  16. +1 −1 indra/newview/llappearancemgr.cpp
  17. +3 −3 indra/newview/llappviewer.cpp
  18. +2 −1 indra/newview/llfloaterpostcard.cpp
  19. +1 −1 indra/newview/llfloaterreporter.cpp
  20. +5 −12 indra/newview/llgesturemgr.cpp
  21. +5 −4 indra/newview/llimpanel.cpp
  22. +2 −1 indra/newview/llimview.cpp
  23. +2 −5 indra/newview/llinventorybridge.cpp
  24. +2 −3 indra/newview/llinventoryfunctions.cpp
  25. +14 −9 indra/newview/llinventorymodel.cpp
  26. +5 −0 indra/newview/llpaneleditwearable.cpp
  27. +16 −27 indra/newview/llstartup.cpp
  28. +11 −0 indra/newview/llviewermenu.cpp
  29. +1 −5 indra/newview/llviewerwindow.cpp
  30. +10 −17 indra/newview/llvoavatar.cpp
  31. +18 −35 indra/newview/llvoavatarself.cpp
  32. +1 −0 indra/newview/llvoavatarself.h
  33. +6 −6 indra/newview/rlvfloaters.cpp
  34. +3 −3 indra/newview/rlvfloaters.h
  35. +4 −0 indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -81,6 +81,7 @@ class LLAvatarBoneInfo
~LLAvatarBoneInfo()
{
std::for_each(mChildList.begin(), mChildList.end(), DeletePointer());
mChildList.clear();
}
BOOL parseXml(LLXmlTreeNode* node);
@@ -108,6 +109,7 @@ class LLAvatarSkeletonInfo
~LLAvatarSkeletonInfo()
{
std::for_each(mBoneInfoList.begin(), mBoneInfoList.end(), DeletePointer());
mBoneInfoList.clear();
}
BOOL parseXml(LLXmlTreeNode* node);
S32 getNumBones() const { return mNumBones; }
@@ -132,14 +134,25 @@ LLAvatarAppearance::LLAvatarXmlInfo::LLAvatarXmlInfo()
LLAvatarAppearance::LLAvatarXmlInfo::~LLAvatarXmlInfo()
{
std::for_each(mMeshInfoList.begin(), mMeshInfoList.end(), DeletePointer());
mMeshInfoList.clear();
std::for_each(mSkeletalDistortionInfoList.begin(), mSkeletalDistortionInfoList.end(), DeletePointer());
mSkeletalDistortionInfoList.clear();
std::for_each(mAttachmentInfoList.begin(), mAttachmentInfoList.end(), DeletePointer());
mAttachmentInfoList.clear();
delete_and_clear(mTexSkinColorInfo);
delete_and_clear(mTexHairColorInfo);
delete_and_clear(mTexEyeColorInfo);
std::for_each(mLayerInfoList.begin(), mLayerInfoList.end(), DeletePointer());
mLayerInfoList.clear();
std::for_each(mDriverInfoList.begin(), mDriverInfoList.end(), DeletePointer());
mDriverInfoList.clear();
std::for_each(mMorphMaskInfoList.begin(), mMorphMaskInfoList.end(), DeletePointer());
mMorphMaskInfoList.clear();
}
@@ -161,7 +161,7 @@ void LLPolyMeshSharedData::freeMeshData()
// mVertFaceMap.deleteAllData();
}
// compate_int is used by the qsort function to sort the index array
// compare_int is used by the qsort function to sort the index array
S32 compare_int(const void *a, const void *b);
//-----------------------------------------------------------------------------
@@ -135,6 +135,7 @@ LLTexGlobalColorInfo::LLTexGlobalColorInfo()
LLTexGlobalColorInfo::~LLTexGlobalColorInfo()
{
for_each(mParamColorInfoList.begin(), mParamColorInfoList.end(), DeletePointer());
mParamColorInfoList.clear();
}
BOOL LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node)
@@ -47,7 +47,6 @@ using namespace LLAvatarAppearanceDefines;
LLWearable* LLWearableData::getWearable(const LLWearableType::EType type, U32 index)
{
//llassert_always(index == 0);
wearableentry_map_t::iterator wearable_iter = mWearableDatas.find(type);
if (wearable_iter == mWearableDatas.end())
{
@@ -66,7 +65,6 @@ LLWearable* LLWearableData::getWearable(const LLWearableType::EType type, U32 in
void LLWearableData::setWearable(const LLWearableType::EType type, U32 index, LLWearable *wearable)
{
//llassert_always(index == 0);
LLWearable *old_wearable = getWearable(type,index);
if (!old_wearable)
{
@@ -100,10 +100,10 @@ LLWearableDictionary::LLWearableDictionary()
addEntry(LLWearableType::WT_ALPHA, new WearableEntry("alpha", "New Alpha", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_ALPHA, FALSE, TRUE));
addEntry(LLWearableType::WT_TATTOO, new WearableEntry("tattoo", "New Tattoo", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_TATTOO, FALSE, TRUE));
// addEntry(LLWearableType::WT_PHYSICS, new WearableEntry("physics", "New Physics", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
// [SL:KB] - Patch: Appearance-Misc | Checked: 2011-05-29 (Catznip-2.6)
addEntry(LLWearableType::WT_PHYSICS, new WearableEntry("physics", "New Physics", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, FALSE));
// [/SL:KB]
// addEntry(LLWearableType::WT_PHYSICS, new WearableEntry("physics", "New Physics", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_PHYSICS, TRUE, TRUE));
addEntry(LLWearableType::WT_UNKNOWN, new WearableEntry("unknown", "Clothing", LLAssetType::AT_CLOTHING, LLInventoryType::ICONNAME_CLOTHING_UNKNOWN, FALSE, TRUE));
addEntry(LLWearableType::WT_INVALID, new WearableEntry("invalid", "Invalid Wearable", LLAssetType::AT_NONE, LLInventoryType::ICONNAME_NONE, FALSE, FALSE));
@@ -153,6 +153,19 @@ const char AURORA_WIND_LAYER_CODE = '9';
const char AURORA_CLOUD_LAYER_CODE = ':';
// </FS:CR> Aurora Sim
enum ETerrainBrushType
{
// the valid brush numbers cannot be reordered, because they
// are used in the binary LSL format as arguments to llModifyLand()
E_LANDBRUSH_LEVEL = 0,
E_LANDBRUSH_RAISE = 1,
E_LANDBRUSH_LOWER = 2,
E_LANDBRUSH_SMOOTH = 3,
E_LANDBRUSH_NOISE = 4,
E_LANDBRUSH_REVERT = 5,
E_LANDBRUSH_INVALID = 6
};
// keys
// Bit masks for various keyboard modifier keys.
const MASK MASK_NONE = 0x0000;
@@ -303,14 +316,6 @@ const U32 START_LOCATION_ID_COUNT = 6;
// group constants
const U32 GROUP_MIN_SIZE = 2;
// gMaxAgentGroups is now sent by login.cgi, which
// looks it up from globals.xml.
//
// For now we need an old default value however,
// so the viewer can be deployed ahead of login.cgi.
//
const S32 DEFAULT_MAX_AGENT_GROUPS = 25;
// radius within which a chat message is fully audible
const F32 CHAT_WHISPER_RADIUS = 10.f;
const F32 CHAT_NORMAL_RADIUS = 20.f;
@@ -341,18 +346,7 @@ const S32 SANDBOX_CLEAN_FREQ = 12;
const F32 WIND_SCALE_HACK = 2.0f; // hack to make wind speeds more realistic
enum ETerrainBrushType
{
// the valid brush numbers cannot be reordered, because they
// are used in the binary LSL format as arguments to llModifyLand()
E_LANDBRUSH_LEVEL = 0,
E_LANDBRUSH_RAISE = 1,
E_LANDBRUSH_LOWER = 2,
E_LANDBRUSH_SMOOTH = 3,
E_LANDBRUSH_NOISE = 4,
E_LANDBRUSH_REVERT = 5,
E_LANDBRUSH_INVALID = 6
};
// media commands
const U32 PARCEL_MEDIA_COMMAND_STOP = 0;
@@ -912,7 +912,6 @@ P(blockingLLSDPost);
P(blockingLLSDGet);
P(blockingRawGet);
P(classifiedStatsResponder);
P(createInventoryCategoryResponder);
P(emeraldDicDownloader);
P(environmentApplyResponder);
P(environmentRequestResponder);
Oops, something went wrong.

0 comments on commit 0773f29

Please sign in to comment.