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

Fixes, foxes, faxes, and "oh fucks."

Browse Source 
Link and unlink buttons are now in the build menu. To facilitate this, some minor elements were adjusted, and the edit boxes were re-aligned. Emerald's layout was pretty sloppy anyway.
More fiddling with the windlight menu, and more dead ends.

Expect at least one more update before night's end to implement the features coming in from the merge.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-02 03:19:13 -04:00
parent 9c207ae7e1
commit 1fe07cfcd7
9 changed files with 98 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/app_settings/settings.xml
View File

@@ -26,7 +26,7 @@
</map>
<key>AscentAvatarZModifier</key>
<map>
<key>Comment</key>
<string>Avatar position modifier (Z)</string>
<key>Persist</key>
<integer>1</integer>
@@ -86,7 +86,7 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<string>F32</string>
<key>Value</key>
<real>100</real>
</map>
@@ -128,33 +128,33 @@
<key>Comment</key>
<string>idfk</string>
<key>Persist</key>
<integer>0</integer>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
<real>50.0</real>
</map>
<key>AscentBuildPrefs_PivotY</key>
<map>
<key>Comment</key>
<string>idfk</string>
<key>Persist</key>
<integer>0</integer>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
<real>50.0</real>
</map>
<key>AscentBuildPrefs_PivotZ</key>
<map>
<key>Comment</key>
<string>idfk</string>
<key>Persist</key>
<integer>0</integer>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
<real>50.0</real>
</map>
<key>AscentCmdLine</key>
<map>

6
indra/newview/llagent.cpp
View File

@@ -241,6 +241,7 @@ std::string LLAgent::lure_maturity;
// </edit>
BOOL LLAgent::exlPhantom = 0;
BOOL LLAgent::mForceTPose = 0;
LLVector3 LLAgent::exlStartMeasurePoint = LLVector3::zero;
LLVector3 LLAgent::exlEndMeasurePoint = LLVector3::zero;
@@ -1561,7 +1562,7 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
*/
BOOL soft_limit = FALSE; // is the bounding box to be treated literally (volumes) or as an approximation (avatars)
if (!mFocusObject || mFocusObject->isDead())
if (!mFocusObject || mFocusObject->isDead() || gSavedSettings.getBOOL("DisableCameraConstraints"))
{
obj_min_distance = 0.f;
return TRUE;
@@ -3646,7 +3647,8 @@ F32 LLAgent::calcCameraFOVZoomFactor()
// don't FOV zoom on mostly transparent objects
LLVector3 focus_offset = mFocusObjectOffset;
F32 obj_min_dist = 0.f;
calcCameraMinDistance(obj_min_dist);
if (!gSavedSettings.getBOOL("AscentDisableMinZoomDist"))
calcCameraMinDistance(obj_min_dist);
F32 current_distance = llmax(0.001f, camera_offset_dir.magVec());
mFocusObjectDist = obj_min_dist - current_distance;

4
indra/newview/llagent.h
View File

@@ -414,8 +414,8 @@ public:
static void setPhantom(BOOL phantom);
static void togglePhantom();
static BOOL isTPosed() { return mForceTPose; };
static void setTPosed(BOOL TPose) { mForceTPose = TPose };
static BOOL isTPosed() { return mForceTPose; }
static void setTPosed(BOOL TPose) { mForceTPose = TPose; }
static void toggleTPosed();
// Does this parcel allow you to fly?

3
indra/newview/lloverlaybar.cpp
View File

@@ -137,9 +137,10 @@ LLOverlayBar::LLOverlayBar()
bool updateAdvSettingsPopup(const LLSD &data)
{
LLOverlayBar::sAdvSettingsPopup = gSavedSettings.getBOOL("wlfAdvSettingsPopup");
gOverlayBar->childSetVisible("AdvSettings_container", !LLOverlayBar::sAdvSettingsPopup);
gOverlayBar->childSetVisible("AdvSettings_container_exp", LLOverlayBar::sAdvSettingsPopup);
return false;
return true;
}
bool updateChatVisible(const LLSD &data)

21
indra/newview/llpanelobject.cpp
View File

@@ -190,6 +190,11 @@ BOOL LLPanelObject::postBuild()
mCtrlRotZ = getChild<LLSpinCtrl>("Rot Z");
childSetCommitCallback("Rot Z",onCommitRotation,this);
mBtnLinkObj = getChild<LLButton>("link_obj");
childSetAction("link_obj",onLinkObj, this);
mBtnUnlinkObj = getChild<LLButton>("unlink_obj");
childSetAction("unlink_obj",onUnlinkObj, this);
mBtnCopyPos = getChild<LLButton>("copypos");
childSetAction("copypos",onCopyPos, this);
mBtnPastePos = getChild<LLButton>("pastepos");
@@ -467,7 +472,7 @@ void LLPanelObject::getState( )
BOOL enable_move = objectp->permMove() && !objectp->isAttachment() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
BOOL enable_scale = objectp->permMove() && objectp->permModify();
BOOL enable_rotate = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
BOOL enable_link = objectp->permMove() && !objectp->isAttachment() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
&& (selected_count == 1);
@@ -514,6 +519,8 @@ void LLPanelObject::getState( )
mCtrlPosX->setEnabled(enable_move);
mCtrlPosY->setEnabled(enable_move);
mCtrlPosZ->setEnabled(enable_move);
mBtnLinkObj->setEnabled((enable_link && !single_volume));
mBtnUnlinkObj->setEnabled((enable_link && (selected_count > 1)));
mBtnCopyPos->setEnabled(enable_move);
mBtnPastePos->setEnabled(enable_move);
mBtnPastePosClip->setEnabled(enable_move);
@@ -2587,6 +2594,18 @@ void LLPanelObject::onPasteParams(void* user_data)
self->mObject->updateVolume(mClipboardVolumeParams);
}
void LLPanelObject::onLinkObj(void* user_data)
{
llinfos << "Attempting link." << llendl;
LLSelectMgr::getInstance()->sendLink();
}
void LLPanelObject::onUnlinkObj(void* user_data)
{
llinfos << "Attempting unlink." << llendl;
LLSelectMgr::getInstance()->sendDelink();
}
void LLPanelObject::onPastePos(void* user_data)
{
if(mClipboardPos.isNull()) return;

15
indra/newview/llpanelobject.h
View File

@@ -74,17 +74,19 @@ public:
static void onCommitPhantom( LLUICtrl* ctrl, void* userdata);
static void onCommitCastShadows( LLUICtrl* ctrl, void* userdata);
static void onLinkObj( void* user_data);
static void onUnlinkObj( void* user_data);
static void onCopyPos( void* user_data);
static void onPastePos( void* user_data);
static void onPastePosClip( void* user_data);
static void onPastePosClip( void* user_data);
static void onCopySize( void* user_data);
static void onPasteSize( void* user_data);
static void onPasteSizeClip( void* user_data);
static void onPasteSizeClip( void* user_data);
static void onCopyRot( void* user_data);
static void onPasteRot( void* user_data);
static void onPasteRotClip( void* user_data);
static void onCopyParams( void* user_data);
static void onPasteParams( void* user_data);
static void onPasteRotClip( void* user_data);
static void onCopyParams( void* user_data);
static void onPasteParams( void* user_data);
static void onCommitParametric( LLUICtrl* ctrl, void* userdata);
@@ -183,6 +185,9 @@ protected:
LLSpinCtrl* mCtrlRotY;
LLSpinCtrl* mCtrlRotZ;
LLButton *mBtnLinkObj;
LLButton *mBtnUnlinkObj;
LLButton *mBtnCopyPos;
LLButton *mBtnPastePos;
LLButton *mBtnPastePosClip;

2
indra/newview/llvoavatar.cpp
View File

@@ -5565,7 +5565,7 @@ void LLVOAvatar::processAnimationStateChanges()
{
LLMemType mt(LLMemType::MTYPE_AVATAR);
if (gNoRender)//||mLockTPose) (For future use -HGB)
if ((gNoRender)||(gAgent.isTPosed())) //isTPosed is meant to stop animation updates while force-TPosed.
{
return;
}

91
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -597,80 +597,79 @@
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="select_single" v_pad="0" width="252">
Select only one primitive to edit parameters.
</text>
<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="left" height="10" left_delta="0"
mouse_opaque="true" name="edit_object" v_pad="0" width="252">
Edit object parameters:
</text>
<button bottom="-26" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="Link" left="10" mouse_opaque="true" name="link_obj" enabled="true"
tool_tip="He come to town..." width="50" />
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="Unlink" left_delta="50" mouse_opaque="true" name="unlink_obj" enabled="true"
tool_tip="Unlinks linkset." width="50" />
<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Locked" left="8" mouse_opaque="true"
initial_value="false" label="Locked" left="5" mouse_opaque="true"
name="checkbox locked"
tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
width="123" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Physical" left="8" mouse_opaque="true"
initial_value="false" label="Physical" left_delta="0" mouse_opaque="true"
name="Physical Checkbox Ctrl"
tool_tip="Allows object to be pushed and affected by gravity" width="123" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Temporary" left="8" mouse_opaque="true"
initial_value="false" label="Temporary" left_delta="0" mouse_opaque="true"
name="Temporary Checkbox Ctrl"
tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Phantom" left="8" mouse_opaque="true"
initial_value="false" label="Phantom" left_delta="0" mouse_opaque="true"
name="Phantom Checkbox Ctrl"
tool_tip="Causes object to not collide with other objects or avatars"
width="123" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="2"
mouse_opaque="true" name="label position" v_pad="0" width="121">
Position (meters)
</text>
<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
increment="0.01" initial_val="0" label="X" label_width="10" left="10"
<spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
increment="0.01" initial_val="0" label="X" label_width="10" left_delta="0"
max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
text_enabled_color="110, 15, 15, 255" width="87" />
<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="0"
max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
text_enabled_color="0, 100, 40, 255" width="87" />
<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
increment="0.01" initial_val="0" label="Z" label_width="10" left_delta="0"
max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
text_enabled_color="0, 67, 132, 255" width="87" />
<button bottom_delta="36" follows="top|right" font="SansSerifSmall" halign="center"
<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="C" left_delta="90" mouse_opaque="true" name="copypos" enabled="true"
tool_tip="Copy Position" width="20" />
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="P" left_delta="0" mouse_opaque="true" name="pastepos" enabled="true"
tool_tip="Paste Position" width="20" />
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="p" left_delta="0" mouse_opaque="true" name="pasteposclip" enabled="true"
tool_tip="Paste Position from Clipboard" width="20" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="5"
bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="7"
mouse_opaque="true" name="label size" v_pad="0" width="121">
Size
</text>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
increment="0.01" initial_val="0" label="X" label_width="10" left="10"
<spinner bottom_delta="-22" decimal_digits="5" follows="left|top" height="16"
increment="0.01" initial_val="0" label="X" label_width="10" left_delta="0"
max_val="1024" min_val="0.01" mouse_opaque="true" name="Scale X"
text_enabled_color="1, 1, 1, 1" width="87" />
<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="0"
max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
text_enabled_color="1, 1, 1, 1" width="87" />
<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
increment="0.01" initial_val="0" label="Z" label_width="10" left_delta="0"
max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
text_enabled_color="1, 1, 1, 1" width="87" />
<button bottom_delta="36" follows="top|right" font="SansSerifSmall" halign="center"
<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="C" left_delta="90" mouse_opaque="true" name="copysize" enabled="true"
tool_tip="Copy Size" width="20" />
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
@@ -682,24 +681,24 @@
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="5"
bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="7"
mouse_opaque="true" name="label rotation" v_pad="0" width="121">
Rotation (degrees)
</text>
<spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
increment="1" initial_val="0" label="X" label_width="10" left="10"
<spinner bottom_delta="-22" decimal_digits="5" follows="left|top" height="16"
increment="1" initial_val="0" label="X" label_width="10" left_delta="0"
max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
text_enabled_color="1, 1, 1, 1" width="87" />
<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
increment="1" initial_val="0" label="Y" label_width="10" left="10"
<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
increment="1" initial_val="0" label="Y" label_width="10" left_delta="0"
max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
text_enabled_color="1, 1, 1, 1" width="87" />
<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
increment="1" initial_val="0" label="Z" label_width="10" left="10"
<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
increment="1" initial_val="0" label="Z" label_width="10" left_delta="0"
max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
text_enabled_color="1, 1, 1, 1" width="87" />
<button bottom_delta="36" follows="top|right" font="SansSerifSmall" halign="center"
<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
height="18" label="C" left_delta="90" mouse_opaque="true" name="copyrot" enabled="true"
tool_tip="Copy Rotation" width="20" />
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
@@ -741,12 +740,18 @@
Rubber
</combo_item>
</combo_box>
<button bottom="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Copy" left="150" mouse_opaque="true" name="copyparams" enabled="true"
tool_tip="Copy Parameters from Clipboard" width="50" />
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Paste" left_delta="50" mouse_opaque="true" name="pasteparams" enabled="true"
tool_tip="Paste Parameters from Clipboard" width="50" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
mouse_opaque="true" name="edit_object" v_pad="0" width="252">
Params:
</text>
<button bottom="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Copy" left="178" mouse_opaque="true" name="copyparams" enabled="true"
tool_tip="Copy Parameters from Clipboard" width="42" />
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Paste" left_delta="42" mouse_opaque="true" name="pasteparams" enabled="true"
tool_tip="Paste Parameters from Clipboard" width="42" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-36" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

3
indra/newview/wlfPanel_AdvSettings.cpp
View File

@@ -118,6 +118,8 @@ BOOL wlfPanel_AdvSettings::postBuild()
}
comboBoxWater->setCommitCallback(onChangePresetName);
fixPointer = this;
/*onClickExpandBtn(fixPointer);
onClickExpandBtn(fixPointer);*/
return TRUE;
}
void wlfPanel_AdvSettings::draw()
@@ -136,6 +138,7 @@ void wlfPanel_AdvSettings::draw()
}
refresh();
LLPanel::draw();
}
wlfPanel_AdvSettings::~wlfPanel_AdvSettings ()
{