mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-15 01:12:23 +00:00
SL-15039 Prune unused preferences #1
List of removed preferences (usused per statistics): AdvanceOutfitSnapshot AnimationDebug AskedAboutCrashReports AudioLevelDoppler AudioLevelRolloff AudioLevelUnderwaterRolloff AudioLevelWind AutoAcceptNewInventory AutoLoadWebProfiles AvatarBacklight AvatarPickerSortOrder AvatarPosFinalOffset AvatarBakedTextureUploadTimeout AvatarBakedLocalTextureUpdateTimeout AnimatedObjectsIgnoreLimits AnimatedObjectsGlobalScale AvatarBoundingBoxComplexity StartUpChannelUUID NearByChatChannelUUID NotificationChannelUUID AlertChannelUUID AssetStorageLogFrequency AvatarInspectorTooltipDelay AllowBottomTrayButtonReordering AvatarRotateThresholdSlow AvatarRotateThresholdFast
This commit is contained in:
Andrey Kleshchev
committed by
akleshchev
akleshchev
parent
ac0299fc7c
commit
d00b6e4216
@@ -137,17 +137,6 @@
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>AdvanceOutfitSnapshot</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Display advanced parameter settings in outfit snaphot interface</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>AgentPause</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -214,17 +203,6 @@
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>AnimationDebug</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Show active animations in a bubble above avatars head</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AppearanceCameraMovement</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -269,17 +247,6 @@
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AskedAboutCrashReports</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Turns off dialog asking if you want to enable crash reporting</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AuctionShowFence</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -302,17 +269,6 @@
|
||||
<key>Value</key>
|
||||
<real>0.5</real>
|
||||
</map>
|
||||
<key>AudioLevelDoppler</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Scale of doppler effect on moving audio sources (1.0 = normal, <1.0 = diminished doppler effect, >1.0 = enhanced doppler effect)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>1.0</real>
|
||||
</map>
|
||||
<key>AudioLevelMaster</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -357,28 +313,6 @@
|
||||
<key>Value</key>
|
||||
<real>0.3</real>
|
||||
</map>
|
||||
<key>AudioLevelRolloff</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Controls the distance-based dropoff of audio volume (fraction or multiple of default audio rolloff)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>1.0</real>
|
||||
</map>
|
||||
<key>AudioLevelUnderwaterRolloff</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Controls the distance-based dropoff of audio volume underwater(fraction or multiple of default audio rolloff)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>5.0</real>
|
||||
</map>
|
||||
<key>AudioLevelSFX</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -411,17 +345,6 @@
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>0.5</real>
|
||||
</map>
|
||||
<key>AudioLevelWind</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Audio level of wind noise when standing still</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>0.5</real>
|
||||
</map>
|
||||
<key>AudioStreamingMedia</key>
|
||||
<map>
|
||||
@@ -456,17 +379,6 @@
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AutoAcceptNewInventory</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Automatically accept new notecards/textures/landmarks</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AutoLeveling</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -478,17 +390,6 @@
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>AutoLoadWebProfiles</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Automatically load ALL profile webpages without asking first.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AutoLogin</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -676,17 +577,6 @@
|
||||
<key>Value</key>
|
||||
<real>1.0</real>
|
||||
</map>
|
||||
<key>AvatarBacklight</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Add rim lighting to avatar rendering to approximate shininess of skin</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>AvatarFeathering</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -698,32 +588,6 @@
|
||||
<key>Value</key>
|
||||
<real>16.0</real>
|
||||
</map>
|
||||
<key>AvatarPickerSortOrder</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Specifies sort key for textures in avatar picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>U32</string>
|
||||
<key>Value</key>
|
||||
<integer>2</integer>
|
||||
</map>
|
||||
<key>AvatarPosFinalOffset</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>After-everything-else fixup for avatar position.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Vector3</string>
|
||||
<key>Value</key>
|
||||
<array>
|
||||
<real>0.0</real>
|
||||
<real>0.0</real>
|
||||
<real>0.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>AvatarPickerURL</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -735,50 +599,6 @@
|
||||
<key>Value</key>
|
||||
<string>http://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/avatars.html</string>
|
||||
</map>
|
||||
<key>AvatarRotateThresholdSlow</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Angle between avatar facing and camera facing at which avatar turns to face same direction as camera, when moving slowly (degrees)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<integer>60</integer>
|
||||
</map>
|
||||
<key>AvatarRotateThresholdFast</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Angle between avatar facing and camera facing at which avatar turns to face same direction as camera, when moving fast (degrees)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<integer>2</integer>
|
||||
</map>
|
||||
<key>AvatarBakedTextureUploadTimeout</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Specifes the maximum time in seconds to wait before sending your baked textures for avatar appearance. Set to 0 to disable and wait until all baked textures are at highest resolution.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>U32</string>
|
||||
<key>Value</key>
|
||||
<integer>60</integer>
|
||||
</map>
|
||||
<key>AvatarBakedLocalTextureUpdateTimeout</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Specifes the maximum time in seconds to wait before updating your appearance during appearance mode.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>U32</string>
|
||||
<key>Value</key>
|
||||
<integer>10</integer>
|
||||
</map>
|
||||
<key>AvatarPhysics</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -2275,17 +2095,6 @@
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AnimatedObjectsIgnoreLimits</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Ignore server-enforced limits on animated objects. This is only useful for server testing.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AnimatedObjectsAllowLeftClick</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -2297,17 +2106,6 @@
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AnimatedObjectsGlobalScale</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Temporary testing: allow an extra scale factor to be forced on animated objects.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>1.00</real>
|
||||
</map>
|
||||
<key>AnimatedObjectsMaxLegalOffset</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -2330,17 +2128,6 @@
|
||||
<key>Value</key>
|
||||
<real>64.0</real>
|
||||
</map>
|
||||
<key>AvatarBoundingBoxComplexity</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>How many aspects to consider for avatar bounding box</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>S32</string>
|
||||
<key>Value</key>
|
||||
<integer>3</integer>
|
||||
</map>
|
||||
<key>DebugAvatarAppearanceMessage</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -13333,50 +13120,6 @@
|
||||
<key>Value</key>
|
||||
<string>5748decc-f629-461c-9a36-a35a221fe21f</string>
|
||||
</map>
|
||||
<key>StartUpChannelUUID</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string />
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>B56AF90D-6684-48E4-B1E4-722D3DEB2CB6</string>
|
||||
</map>
|
||||
<key>NearByChatChannelUUID</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string />
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>E1158BD6-661C-4981-9DAD-4DCBFF062502</string>
|
||||
</map>
|
||||
<key>NotificationChannelUUID</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string />
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>AEED3193-8709-4693-8558-7452CCA97AE5</string>
|
||||
</map>
|
||||
<key>AlertChannelUUID</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string />
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>F3E07BC8-A973-476D-8C7F-F3B7293975D1</string>
|
||||
</map>
|
||||
<key>UIImgWhiteUUID</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -15305,17 +15048,6 @@
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AssetStorageLogFrequency</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Seconds between display of AssetStorage info in log (0 for never)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>60.0</real>
|
||||
</map>
|
||||
<key>LogWearableAssetSave</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -15608,17 +15340,6 @@
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AvatarInspectorTooltipDelay</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Seconds before displaying avatar inspector tooltip</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>F32</string>
|
||||
<key>Value</key>
|
||||
<real>0.35</real>
|
||||
</map>
|
||||
<key>ObjectInspectorTooltipDelay</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -15827,17 +15548,6 @@
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AllowBottomTrayButtonReordering</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Allow user to move and hide bottom tray buttons</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>AllowSelectAvatar</key>
|
||||
<map>
|
||||
|
||||
@@ -88,7 +88,7 @@ LLScreenChannel* LLChannelManager::createNotificationChannel()
|
||||
{
|
||||
// creating params for a channel
|
||||
LLScreenChannelBase::Params p;
|
||||
p.id = LLUUID(gSavedSettings.getString("NotificationChannelUUID"));
|
||||
p.id = NOTIFICATION_CHANNEL_UUID;
|
||||
p.channel_align = CA_RIGHT;
|
||||
p.toast_align = NA_TOP;
|
||||
|
||||
@@ -108,7 +108,7 @@ void LLChannelManager::onLoginCompleted()
|
||||
if (!channel) continue;
|
||||
|
||||
// don't calc notifications for Nearby Chat
|
||||
if(channel->getChannelID() == LLUUID(gSavedSettings.getString("NearByChatChannelUUID")))
|
||||
if(channel->getChannelID() == NEARBY_CHAT_CHANNEL_UUID)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ void LLChannelManager::onLoginCompleted()
|
||||
{
|
||||
// create a channel for the StartUp Toast
|
||||
LLScreenChannelBase::Params p;
|
||||
p.id = LLUUID(gSavedSettings.getString("StartUpChannelUUID"));
|
||||
p.id = STARTUP_CHANNEL_UUID;
|
||||
p.channel_align = CA_RIGHT;
|
||||
mStartUpChannel = createChannel(p);
|
||||
|
||||
@@ -164,7 +164,7 @@ void LLChannelManager::onStartUpToastClose()
|
||||
{
|
||||
mStartUpChannel->setVisible(FALSE);
|
||||
mStartUpChannel->closeStartUpToast();
|
||||
removeChannelByID(LLUUID(gSavedSettings.getString("StartUpChannelUUID")));
|
||||
removeChannelByID(STARTUP_CHANNEL_UUID);
|
||||
mStartUpChannel = NULL;
|
||||
}
|
||||
|
||||
@@ -258,12 +258,12 @@ LLNotificationsUI::LLScreenChannel* LLChannelManager::getNotificationScreenChann
|
||||
{
|
||||
LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
|
||||
(LLNotificationsUI::LLChannelManager::getInstance()->
|
||||
findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
|
||||
findChannelByID(NOTIFICATION_CHANNEL_UUID));
|
||||
|
||||
if (channel == NULL)
|
||||
{
|
||||
LL_WARNS() << "Can't find screen channel by NotificationChannelUUID" << LL_ENDL;
|
||||
llassert(!"Can't find screen channel by NotificationChannelUUID");
|
||||
LL_WARNS() << "Can't find screen channel by Notification Channel UUID" << LL_ENDL;
|
||||
llassert(!"Can't find screen channel by Notification Channel UUID");
|
||||
}
|
||||
|
||||
return channel;
|
||||
|
||||
@@ -99,21 +99,6 @@ LLVOAvatar *LLControlAvatar::getAttachedAvatar()
|
||||
|
||||
void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_scale_fixup) const
|
||||
{
|
||||
|
||||
F32 max_legal_offset = MAX_LEGAL_OFFSET;
|
||||
if (gSavedSettings.getControl("AnimatedObjectsMaxLegalOffset"))
|
||||
{
|
||||
max_legal_offset = gSavedSettings.getF32("AnimatedObjectsMaxLegalOffset");
|
||||
}
|
||||
max_legal_offset = llmax(max_legal_offset,0.f);
|
||||
|
||||
F32 max_legal_size = MAX_LEGAL_SIZE;
|
||||
if (gSavedSettings.getControl("AnimatedObjectsMaxLegalSize"))
|
||||
{
|
||||
max_legal_size = gSavedSettings.getF32("AnimatedObjectsMaxLegalSize");
|
||||
}
|
||||
max_legal_size = llmax(max_legal_size, 1.f);
|
||||
|
||||
new_pos_fixup = LLVector3();
|
||||
new_scale_fixup = 1.0f;
|
||||
LLVector3 vol_pos = mRootVolp->getRenderPosition();
|
||||
@@ -138,9 +123,9 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
|
||||
{
|
||||
LLVector3 pos_box_offset = point_to_box_offset(vol_pos, unshift_extents);
|
||||
F32 offset_dist = pos_box_offset.length();
|
||||
if (offset_dist > max_legal_offset && offset_dist > 0.f)
|
||||
if (offset_dist > MAX_LEGAL_OFFSET && offset_dist > 0.f)
|
||||
{
|
||||
F32 target_dist = (offset_dist - max_legal_offset);
|
||||
F32 target_dist = (offset_dist - MAX_LEGAL_OFFSET);
|
||||
new_pos_fixup = (target_dist/offset_dist)*pos_box_offset;
|
||||
}
|
||||
if (new_pos_fixup != mPositionConstraintFixup)
|
||||
@@ -153,11 +138,11 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
|
||||
|
||||
}
|
||||
}
|
||||
if (box_size/mScaleConstraintFixup > max_legal_size)
|
||||
if (box_size/mScaleConstraintFixup > MAX_LEGAL_SIZE)
|
||||
{
|
||||
new_scale_fixup = mScaleConstraintFixup*max_legal_size/box_size;
|
||||
new_scale_fixup = mScaleConstraintFixup* MAX_LEGAL_SIZE /box_size;
|
||||
LL_DEBUGS("ConstraintFix") << getFullname() << " scale fix, box_size " << box_size << " fixup "
|
||||
<< mScaleConstraintFixup << " max legal " << max_legal_size
|
||||
<< mScaleConstraintFixup << " max legal " << MAX_LEGAL_SIZE
|
||||
<< " -> new scale " << new_scale_fixup << LL_ENDL;
|
||||
}
|
||||
}
|
||||
@@ -202,8 +187,7 @@ void LLControlAvatar::matchVolumeTransform()
|
||||
mRoot->setWorldRotation(obj_rot * joint_rot);
|
||||
setRotation(mRoot->getRotation());
|
||||
|
||||
F32 global_scale = gSavedSettings.getF32("AnimatedObjectsGlobalScale");
|
||||
setGlobalScale(global_scale * mScaleConstraintFixup);
|
||||
setGlobalScale(mScaleConstraintFixup);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -253,8 +237,7 @@ void LLControlAvatar::matchVolumeTransform()
|
||||
}
|
||||
mRoot->setPosition(vol_pos + mPositionConstraintFixup);
|
||||
|
||||
F32 global_scale = gSavedSettings.getF32("AnimatedObjectsGlobalScale");
|
||||
setGlobalScale(global_scale * mScaleConstraintFixup);
|
||||
setGlobalScale(mScaleConstraintFixup);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -260,7 +260,8 @@ void LLFloaterIMNearbyChat::loadHistory()
|
||||
|
||||
void LLFloaterIMNearbyChat::removeScreenChat()
|
||||
{
|
||||
LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID")));
|
||||
LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
|
||||
LLNotificationsUI::NEARBY_CHAT_CHANNEL_UUID);
|
||||
if(chat_channel)
|
||||
{
|
||||
chat_channel->removeToastsFromChannel();
|
||||
|
||||
@@ -459,7 +459,7 @@ LLFloaterIMNearbyChatHandler::LLFloaterIMNearbyChatHandler()
|
||||
{
|
||||
// Getting a Channel for our notifications
|
||||
LLFloaterIMNearbyChatScreenChannel::Params p;
|
||||
p.id = LLUUID(gSavedSettings.getString("NearByChatChannelUUID"));
|
||||
p.id = NEARBY_CHAT_CHANNEL_UUID;
|
||||
LLFloaterIMNearbyChatScreenChannel* channel = new LLFloaterIMNearbyChatScreenChannel(p);
|
||||
|
||||
LLFloaterIMNearbyChatScreenChannel::create_toast_panel_callback_t callback = createToastPanel;
|
||||
|
||||
@@ -651,7 +651,7 @@ void LLFloaterIMSession::setDocked(bool docked, bool pop_on_undock)
|
||||
// update notification channel state
|
||||
LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
|
||||
(LLNotificationsUI::LLChannelManager::getInstance()->
|
||||
findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
|
||||
findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
|
||||
|
||||
if(!isChatMultiTab())
|
||||
{
|
||||
@@ -687,7 +687,7 @@ void LLFloaterIMSession::setVisible(BOOL visible)
|
||||
{
|
||||
LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
|
||||
(LLNotificationsUI::LLChannelManager::getInstance()->
|
||||
findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
|
||||
findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
|
||||
|
||||
LLFloaterIMSessionTab::setVisible(visible);
|
||||
|
||||
@@ -865,7 +865,7 @@ void LLFloaterIMSession::updateMessages()
|
||||
// remove embedded notification from channel
|
||||
LLNotificationsUI::LLScreenChannel* channel = static_cast<LLNotificationsUI::LLScreenChannel*>
|
||||
(LLNotificationsUI::LLChannelManager::getInstance()->
|
||||
findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
|
||||
findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
|
||||
if (getVisible())
|
||||
{
|
||||
// toast will be automatically closed since it is not storable toast
|
||||
|
||||
@@ -154,7 +154,7 @@ LLPanel * LLFloaterNotificationsTabbed::findItemByID(const LLUUID& id, std::stri
|
||||
void LLFloaterNotificationsTabbed::initChannel()
|
||||
{
|
||||
LLNotificationsUI::LLScreenChannelBase* channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
|
||||
LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
|
||||
LLNotificationsUI::NOTIFICATION_CHANNEL_UUID);
|
||||
mChannel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>(channel);
|
||||
if(NULL == mChannel)
|
||||
{
|
||||
|
||||
@@ -189,18 +189,6 @@ void inventory_offer_handler(LLOfferInfo* info)
|
||||
return;
|
||||
}
|
||||
|
||||
bool bAutoAccept(false);
|
||||
// Avoid the Accept/Discard dialog if the user so desires. JC
|
||||
if (gSavedSettings.getBOOL("AutoAcceptNewInventory")
|
||||
&& (info->mType == LLAssetType::AT_NOTECARD
|
||||
|| info->mType == LLAssetType::AT_LANDMARK
|
||||
|| info->mType == LLAssetType::AT_TEXTURE))
|
||||
{
|
||||
// For certain types, just accept the items into the inventory,
|
||||
// and possibly open them on receipt depending upon "ShowNewInventory".
|
||||
bAutoAccept = true;
|
||||
}
|
||||
|
||||
// Strip any SLURL from the message display. (DEV-2754)
|
||||
std::string msg = info->mDesc;
|
||||
int indx = msg.find(" ( http://slurl.com/secondlife/");
|
||||
@@ -266,7 +254,7 @@ void inventory_offer_handler(LLOfferInfo* info)
|
||||
LLNotification::Params p;
|
||||
|
||||
// Object -> Agent Inventory Offer
|
||||
if (info->mFromObject && !bAutoAccept)
|
||||
if (info->mFromObject)
|
||||
{
|
||||
// Inventory Slurls don't currently work for non agent transfers, so only display the object name.
|
||||
args["ITEM_SLURL"] = msg;
|
||||
@@ -312,13 +300,10 @@ void inventory_offer_handler(LLOfferInfo* info)
|
||||
send_do_not_disturb_message(gMessageSystem, info->mFromID);
|
||||
}
|
||||
|
||||
if (!bAutoAccept) // if we auto accept, do not pester the user
|
||||
{
|
||||
// Inform user that there is a script floater via toast system
|
||||
payload["give_inventory_notification"] = TRUE;
|
||||
p.payload = payload;
|
||||
LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
|
||||
}
|
||||
// Inform user that there is a script floater via toast system
|
||||
payload["give_inventory_notification"] = TRUE;
|
||||
p.payload = payload;
|
||||
LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
|
||||
}
|
||||
|
||||
LLFirstUse::newInventory();
|
||||
|
||||
@@ -60,8 +60,8 @@ private:
|
||||
LLInspectToast::LLInspectToast(const LLSD& notification_id) :
|
||||
LLInspect(LLSD()), mPanel(NULL)
|
||||
{
|
||||
LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(
|
||||
LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
|
||||
LLScreenChannelBase* channel = LLChannelManager::getInstance()->findChannelByID(
|
||||
LLNotificationsUI::NOTIFICATION_CHANNEL_UUID);
|
||||
mScreenChannel = dynamic_cast<LLScreenChannel*>(channel);
|
||||
if(NULL == mScreenChannel)
|
||||
{
|
||||
|
||||
@@ -46,7 +46,7 @@ LLAlertHandler::LLAlertHandler(const std::string& name, const std::string& notif
|
||||
mIsModal(is_modal)
|
||||
{
|
||||
LLScreenChannelBase::Params p;
|
||||
p.id = LLUUID(gSavedSettings.getString("AlertChannelUUID"));
|
||||
p.id = ALERT_CHANNEL_UUID;
|
||||
p.display_toasts_always = true;
|
||||
p.toast_align = NA_CENTRE;
|
||||
p.channel_align = CA_CENTRE;
|
||||
|
||||
@@ -115,7 +115,7 @@ void LLPersistentNotificationStorage::loadNotifications()
|
||||
|
||||
using namespace LLNotificationsUI;
|
||||
LLScreenChannel* notification_channel = dynamic_cast<LLScreenChannel*>(LLChannelManager::getInstance()->
|
||||
findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
|
||||
findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
|
||||
|
||||
LLNotifications& instance = LLNotifications::instance();
|
||||
S32 processed_notifications = 0;
|
||||
|
||||
@@ -34,6 +34,10 @@
|
||||
|
||||
namespace LLNotificationsUI
|
||||
{
|
||||
const LLUUID ALERT_CHANNEL_UUID("F3E07BC8-A973-476D-8C7F-F3B7293975D1");
|
||||
const LLUUID NOTIFICATION_CHANNEL_UUID("AEED3193-8709-4693-8558-7452CCA97AE5");
|
||||
const LLUUID NEARBY_CHAT_CHANNEL_UUID("E1158BD6-661C-4981-9DAD-4DCBFF062502");
|
||||
const LLUUID STARTUP_CHANNEL_UUID("B56AF90D-6684-48E4-B1E4-722D3DEB2CB6");
|
||||
|
||||
typedef enum e_notification_toast_alignment
|
||||
{
|
||||
|
||||
@@ -335,7 +335,7 @@ void LLScriptFloater::hideToastsIfNeeded()
|
||||
|
||||
// find channel
|
||||
LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(LLChannelManager::getInstance()->findChannelByID(
|
||||
LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
|
||||
LLNotificationsUI::NOTIFICATION_CHANNEL_UUID));
|
||||
// update notification channel state
|
||||
if(channel)
|
||||
{
|
||||
|
||||
@@ -127,8 +127,8 @@ void LLSysWellWindow::removeItemByID(const LLUUID& id)
|
||||
//---------------------------------------------------------------------------------
|
||||
void LLSysWellWindow::initChannel()
|
||||
{
|
||||
LLNotificationsUI::LLScreenChannelBase* channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
|
||||
LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
|
||||
LLNotificationsUI::LLScreenChannelBase* channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(
|
||||
LLNotificationsUI::NOTIFICATION_CHANNEL_UUID);
|
||||
mChannel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>(channel);
|
||||
if(NULL == mChannel)
|
||||
{
|
||||
|
||||
@@ -439,14 +439,12 @@ void LLAvatarTexBar::draw()
|
||||
text_color, LLFontGL::LEFT, LLFontGL::TOP); //, LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
|
||||
line_num++;
|
||||
}
|
||||
const U32 texture_timeout = gSavedSettings.getU32("AvatarBakedTextureUploadTimeout");
|
||||
const U32 override_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel");
|
||||
|
||||
LLColor4 header_color(1.f, 1.f, 1.f, 0.9f);
|
||||
|
||||
const std::string texture_timeout_str = texture_timeout ? llformat("%d",texture_timeout) : "Disabled";
|
||||
const std::string override_tex_discard_level_str = override_tex_discard_level ? llformat("%d",override_tex_discard_level) : "Disabled";
|
||||
std::string header_text = llformat("[ Timeout('AvatarBakedTextureUploadTimeout'):%s ] [ LOD_Override('TextureDiscardLevel'):%s ]", texture_timeout_str.c_str(), override_tex_discard_level_str.c_str());
|
||||
std::string header_text = llformat("[ Timeout:60 ] [ LOD_Override('TextureDiscardLevel'):%s ]", override_tex_discard_level_str.c_str());
|
||||
LLFontGL::getFontMonospace()->renderUTF8(header_text, 0, l_offset, v_offset + line_height*line_num,
|
||||
header_color, LLFontGL::LEFT, LLFontGL::TOP); //, LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT);
|
||||
line_num++;
|
||||
|
||||
@@ -1110,6 +1110,8 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
|
||||
final_name = LLTrans::getString("TooltipPerson");;
|
||||
}
|
||||
|
||||
const F32 INSPECTOR_TOOLTIP_DELAY = 0.35f;
|
||||
|
||||
LLInspector::Params p;
|
||||
p.fillFrom(LLUICtrlFactory::instance().getDefaultParams<LLInspector>());
|
||||
p.message(final_name);
|
||||
@@ -1117,7 +1119,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
|
||||
p.click_callback(boost::bind(showAvatarInspector, hover_object->getID()));
|
||||
p.visible_time_near(6.f);
|
||||
p.visible_time_far(3.f);
|
||||
p.delay_time(gSavedSettings.getF32("AvatarInspectorTooltipDelay"));
|
||||
p.delay_time(INSPECTOR_TOOLTIP_DELAY);
|
||||
p.wrap(false);
|
||||
|
||||
LLToolTipMgr::instance().show(p);
|
||||
|
||||
@@ -418,12 +418,19 @@ void audio_update_volume(bool force_update)
|
||||
|
||||
gAudiop->setMasterGain ( master_volume );
|
||||
|
||||
gAudiop->setDopplerFactor(gSavedSettings.getF32("AudioLevelDoppler"));
|
||||
const F32 AUDIO_LEVEL_DOPPLER = 1.f;
|
||||
gAudiop->setDopplerFactor(AUDIO_LEVEL_DOPPLER);
|
||||
|
||||
if(!LLViewerCamera::getInstance()->cameraUnderWater())
|
||||
gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
|
||||
if(!LLViewerCamera::getInstance()->cameraUnderWater())
|
||||
{
|
||||
const F32 AUDIO_LEVEL_ROLLOFF = 1.f;
|
||||
gAudiop->setRolloffFactor(AUDIO_LEVEL_ROLLOFF);
|
||||
}
|
||||
else
|
||||
gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelUnderwaterRolloff"));
|
||||
{
|
||||
const F32 AUDIO_LEVEL_UNDERWATER_ROLLOFF = 5.f;
|
||||
gAudiop->setRolloffFactor(AUDIO_LEVEL_UNDERWATER_ROLLOFF);
|
||||
}
|
||||
|
||||
gAudiop->setMuted(mute_audio || progress_view_visible);
|
||||
|
||||
@@ -532,8 +539,8 @@ void audio_update_wind(bool force_update)
|
||||
// whereas steady-state avatar walk velocity is only 3.2 m/s.
|
||||
// Without this the world feels desolate on first login when you are
|
||||
// standing still.
|
||||
static LLUICachedControl<F32> wind_level("AudioLevelWind", 0.5f);
|
||||
LLVector3 scaled_wind_vec = gWindVec * wind_level;
|
||||
const F32 WIND_LEVEL = 0.5f;
|
||||
LLVector3 scaled_wind_vec = gWindVec * WIND_LEVEL;
|
||||
|
||||
// Mix in the avatar's motion, subtract because when you walk north,
|
||||
// the apparent wind moves south.
|
||||
|
||||
@@ -815,9 +815,6 @@ void settings_setup_listeners()
|
||||
setting_setup_signal_listener(gSavedSettings, "AudioLevelMusic", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "AudioLevelMedia", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "AudioLevelVoice", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "AudioLevelDoppler", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "AudioLevelRolloff", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "AudioLevelUnderwaterRolloff", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "MuteAudio", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "MuteMusic", handleAudioVolumeChanged);
|
||||
setting_setup_signal_listener(gSavedSettings, "MuteMedia", handleAudioVolumeChanged);
|
||||
|
||||
@@ -228,8 +228,8 @@ void display_stats()
|
||||
LLMemory::logMemoryInfo(TRUE) ;
|
||||
gRecentMemoryTime.reset();
|
||||
}
|
||||
F32 asset_storage_log_freq = gSavedSettings.getF32("AssetStorageLogFrequency");
|
||||
if (asset_storage_log_freq > 0.f && gAssetStorageLogTime.getElapsedTimeF32() >= asset_storage_log_freq)
|
||||
const F32 ASSET_STORAGE_LOG_FREQUENCY = 60.f;
|
||||
if (gAssetStorageLogTime.getElapsedTimeF32() >= ASSET_STORAGE_LOG_FREQUENCY)
|
||||
{
|
||||
LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("DS - Asset Storage");
|
||||
gAssetStorageLogTime.reset();
|
||||
|
||||
@@ -1616,8 +1616,9 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
|
||||
const LLUUID& blocked_id;
|
||||
};
|
||||
|
||||
LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(LLUUID(
|
||||
gSavedSettings.getString("NotificationChannelUUID")), OfferMatcher(blocked_id));
|
||||
LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(
|
||||
LLNotificationsUI::NOTIFICATION_CHANNEL_UUID,
|
||||
OfferMatcher(blocked_id));
|
||||
}
|
||||
|
||||
|
||||
@@ -5737,8 +5738,9 @@ void script_question_mute(const LLUUID& task_id, const std::string& object_name)
|
||||
const LLUUID& blocked_id;
|
||||
};
|
||||
|
||||
LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(LLUUID(
|
||||
gSavedSettings.getString("NotificationChannelUUID")), OfferMatcher(task_id));
|
||||
LLNotificationsUI::LLChannelManager::getInstance()->killToastsFromChannel(
|
||||
LLNotificationsUI::NOTIFICATION_CHANNEL_UUID,
|
||||
OfferMatcher(task_id));
|
||||
}
|
||||
|
||||
static LLNotificationFunctorRegistration script_question_cb_reg_1("ScriptQuestion", script_question_cb);
|
||||
|
||||
@@ -3867,20 +3867,13 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
|
||||
S32 LLViewerObject::getAnimatedObjectMaxTris() const
|
||||
{
|
||||
S32 max_tris = 0;
|
||||
if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
|
||||
if (gAgent.getRegion())
|
||||
{
|
||||
max_tris = S32_MAX;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gAgent.getRegion())
|
||||
LLSD features;
|
||||
gAgent.getRegion()->getSimulatorFeatures(features);
|
||||
if (features.has("AnimatedObjects"))
|
||||
{
|
||||
LLSD features;
|
||||
gAgent.getRegion()->getSimulatorFeatures(features);
|
||||
if (features.has("AnimatedObjects"))
|
||||
{
|
||||
max_tris = features["AnimatedObjects"]["AnimatedObjectMaxTris"].asInteger();
|
||||
}
|
||||
max_tris = features["AnimatedObjects"]["AnimatedObjectMaxTris"].asInteger();
|
||||
}
|
||||
}
|
||||
return max_tris;
|
||||
|
||||
@@ -186,11 +186,11 @@ BOOL LLViewerTexLayerSetBuffer::isReadyToUpdate() const
|
||||
|
||||
// Update if we've hit a timeout. Unlike for uploads, we can make this timeout fairly small
|
||||
// since render unnecessarily doesn't cost much.
|
||||
const U32 texture_timeout = gSavedSettings.getU32("AvatarBakedLocalTextureUpdateTimeout");
|
||||
if (texture_timeout != 0)
|
||||
const U32 TEXTURE_TIMEOUT = 10;
|
||||
if (TEXTURE_TIMEOUT != 0)
|
||||
{
|
||||
// If we hit our timeout and have textures available at even lower resolution, then update.
|
||||
const BOOL is_update_textures_timeout = mNeedsUpdateTimer.getElapsedTimeF32() >= texture_timeout;
|
||||
const BOOL is_update_textures_timeout = mNeedsUpdateTimer.getElapsedTimeF32() >= TEXTURE_TIMEOUT;
|
||||
const BOOL has_lower_lod = getViewerTexLayerSet()->isLocalTextureDataAvailable();
|
||||
if (has_lower_lod && is_update_textures_timeout) return TRUE;
|
||||
}
|
||||
|
||||
@@ -1351,8 +1351,8 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
|
||||
{
|
||||
LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
|
||||
|
||||
static LLCachedControl<S32> box_detail_cache(gSavedSettings, "AvatarBoundingBoxComplexity");
|
||||
S32 box_detail = box_detail_cache;
|
||||
const S32 BOX_DETAIL_DEFAULT = 3;
|
||||
S32 box_detail = BOX_DETAIL_DEFAULT;
|
||||
if (getOverallAppearance() != AOA_NORMAL)
|
||||
{
|
||||
if (isControlAvatar())
|
||||
@@ -4248,10 +4248,10 @@ void LLVOAvatar::updateOrientation(LLAgent& agent, F32 speed, F32 delta_time)
|
||||
|
||||
LLVector3 pelvisDir( mRoot->getWorldMatrix().getFwdRow4().mV );
|
||||
|
||||
static LLCachedControl<F32> s_pelvis_rot_threshold_slow(gSavedSettings, "AvatarRotateThresholdSlow", 60.0);
|
||||
static LLCachedControl<F32> s_pelvis_rot_threshold_fast(gSavedSettings, "AvatarRotateThresholdFast", 2.0);
|
||||
const F32 AVATAR_PELVIS_ROTATE_THRESHOLD_SLOW = 60.0f;
|
||||
const F32 AVATAR_PELVIS_ROTATE_THRESHOLD_FAST = 2.0f;
|
||||
|
||||
F32 pelvis_rot_threshold = clamp_rescale(speed, 0.1f, 1.0f, s_pelvis_rot_threshold_slow, s_pelvis_rot_threshold_fast);
|
||||
F32 pelvis_rot_threshold = clamp_rescale(speed, 0.1f, 1.0f, AVATAR_PELVIS_ROTATE_THRESHOLD_SLOW, AVATAR_PELVIS_ROTATE_THRESHOLD_FAST);
|
||||
|
||||
if (self_in_mouselook)
|
||||
{
|
||||
|
||||
@@ -5891,7 +5891,7 @@ void LLPipeline::setupAvatarLights(bool for_edit)
|
||||
light->setSpotExponent(0.f);
|
||||
light->setSpotCutoff(180.f);
|
||||
}
|
||||
else if (gAvatarBacklight) // Always true (unless overridden in a devs .ini)
|
||||
else if (gAvatarBacklight)
|
||||
{
|
||||
LLVector3 light_dir = sun_up ? LLVector3(mSunDir) : LLVector3(mMoonDir);
|
||||
LLVector3 opposite_pos = -light_dir;
|
||||
|
||||
Reference in New Issue
Block a user