Adding region settings for Combat2 #1640
Open
+296
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…gs. Processed by LLFloaterRegionInfo. Does not tie into UI yet.
… Combat2 values on the simulator.
…rt to landing point on death.
…' into rider/Combat2 fixing conflicts
brad-linden
requested changes
Jun 5, 2024
| left="250" | ||
| name="Combat" | ||
| top="110" | ||
| width="220"> |
There was a problem hiding this comment.
If we want to hide this, then I'd add
Suggested change
| width="220"> | |
| width="220" | |
| visibility_control="Combat2ShowExperimentalUI"> |
and add the following to the bottom of settings.xml:
<key>Combat2ShowExperimentalUI</key>
<map>
<key>Comment</key>
<string>Enable Combat2 UI support</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
brad-linden
reviewed
Jun 5, 2024
| @@ -500,7 +522,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg) | |||
| panel->getChild<LLUICtrl>("block_terraform_check")->setValue(is_flag_set(region_flags, REGION_FLAGS_BLOCK_TERRAFORM)); | |||
| panel->getChild<LLUICtrl>("block_fly_check")->setValue(is_flag_set(region_flags, REGION_FLAGS_BLOCK_FLY)); | |||
| panel->getChild<LLUICtrl>("block_fly_over_check")->setValue(is_flag_set(region_flags, REGION_FLAGS_BLOCK_FLYOVER)); | |||
| panel->getChild<LLUICtrl>("allow_damage_check")->setValue(is_flag_set(region_flags, REGION_FLAGS_ALLOW_DAMAGE)); | |||
| panel->getChild<LLUICtrl>("allow_damage_check")->setValue((region_flags & REGION_FLAGS_ALLOW_DAMAGE) ? TRUE : FALSE ); | |||
There was a problem hiding this comment.
these should probably be true and false. the BOOL->bool changes have merged into this branch
brad-linden
reviewed
Jun 5, 2024
Comment on lines
543
to
562
| panel->getChild<LLUICtrl>("allow_damage_check")->setValue((region_flags & REGION_FLAGS_ALLOW_DAMAGE) ? TRUE : FALSE); | ||
|
|
||
| panel->getChild<LLUICtrl>("combat_restrict_log")->setValue((combat_flags & REGION_COMBAT_FLAG_RESTRICT_LOG) ? TRUE : FALSE); | ||
| panel->getChild<LLUICtrl>("combat_allow_damage_adjust")->setValue((combat_flags & REGION_COMBAT_FLAG_DAMAGE_ADJUST) ? TRUE : FALSE); | ||
| panel->getChild<LLUICtrl>("combat_restore_health")->setValue((combat_flags & REGION_COMBAT_FLAG_RESTORE_HEALTH) ? TRUE : FALSE); | ||
| panel->getChild<LLUICtrl>("combat_on_death")->setValue(on_death); | ||
| panel->getChild<LLUICtrl>("combat_dps_spin")->setValue(damage_throttle); | ||
| panel->getChild<LLUICtrl>("combat_hps_spin")->setValue(regeneration_rate); | ||
| panel->getChild<LLUICtrl>("combat_invuln_spin")->setValue(invulnerability_time); | ||
|
|
||
| BOOL combat2_enabled = ((region_flags & REGION_FLAGS_ALLOW_DAMAGE) && supports_combat2) ? TRUE : FALSE; | ||
|
|
||
| panel->getChild<LLUICtrl>("combat_restrict_log")->setEnabled(combat2_enabled); | ||
| panel->getChild<LLUICtrl>("combat_allow_damage_adjust")->setEnabled(combat2_enabled); | ||
| panel->getChild<LLUICtrl>("combat_restore_health")->setEnabled(combat2_enabled); | ||
| panel->getChild<LLUICtrl>("combat_on_death")->setEnabled(combat2_enabled); | ||
| panel->getChild<LLUICtrl>("combat_dps_spin")->setEnabled(combat2_enabled); | ||
| panel->getChild<LLUICtrl>("combat_hps_spin")->setEnabled(combat2_enabled); | ||
| panel->getChild<LLUICtrl>("combat_invuln_spin")->setEnabled(combat2_enabled); | ||
|
|
There was a problem hiding this comment.
more BOOL->bool changes in this block
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a number of fields to the Region tab of the Region/Estate floater and allows them to be set from the viewer. Also looks for the optional
CombatSettingsblock when processing region settings for display. If the block is missing will disable non-relevant fields.