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

Added blink to the build floater (god damnit mikey)

Browse Source
This commit is contained in:
SimmanFederal
2010-05-19 03:19:21 -05:00
parent 81af23798a
commit b8f11b18c4
3 changed files with 86 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llpanelobject.cpp
View File

@@ -118,6 +118,10 @@ BOOL LLPanelObject::postBuild()
mCheckPhysics = getChild<LLCheckBoxCtrl>("Physical Checkbox Ctrl"); mCheckPhysics = getChild<LLCheckBoxCtrl>("Physical Checkbox Ctrl");
childSetCommitCallback("Physical Checkbox Ctrl",onCommitPhysics,this); childSetCommitCallback("Physical Checkbox Ctrl",onCommitPhysics,this);
//Blink [SimmanFederal] Inspired by VLife/Oynx
mClickBlink = getChild<LLButton>("button blink");
childSetAction("button blink",&onClickBlink,this);
// Temporary checkbox // Temporary checkbox
mCheckTemporary = getChild<LLCheckBoxCtrl>("Temporary Checkbox Ctrl"); mCheckTemporary = getChild<LLCheckBoxCtrl>("Temporary Checkbox Ctrl");
childSetCommitCallback("Temporary Checkbox Ctrl",onCommitTemporary,this); childSetCommitCallback("Temporary Checkbox Ctrl",onCommitTemporary,this);
@@ -477,6 +481,10 @@ void LLPanelObject::getState( )
// </edit> // </edit>
//<derp> Griefer Technology ~[SimmanFederal]
childSetEnabled("button blink", root_objectp->permModify());
//</derp>
// Select Single Message // Select Single Message
childSetVisible("select_single", FALSE); childSetVisible("select_single", FALSE);
childSetVisible("edit_object", FALSE); childSetVisible("edit_object", FALSE);
@@ -2019,6 +2027,19 @@ void LLPanelObject::onCommitPhysics( LLUICtrl* ctrl, void* userdata )
self->sendIsPhysical(); self->sendIsPhysical();
} }
//[SimmanFederal] Blinking function. Inspired by VLife/Oynx.
void LLPanelObject::onClickBlink(void* data)
{
LLViewerObject* objpos = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject();
if(objpos)
{
LLVector3 pos = objpos->getPosition();
pos.mV[VZ] = 9001.0f;
objpos->setPositionParent(pos);
LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
}
}
// static // static
void LLPanelObject::onCommitTemporary( LLUICtrl* ctrl, void* userdata ) void LLPanelObject::onCommitTemporary( LLUICtrl* ctrl, void* userdata )
{ {

4
indra/newview/llpanelobject.h
View File

@@ -65,6 +65,8 @@ public:
static BOOL precommitValidate(LLUICtrl* ctrl,void* userdata); static BOOL precommitValidate(LLUICtrl* ctrl,void* userdata);
static void onClickBlink(void* userdata);//[SimmanFederal] Blinking
static void onCommitLock(LLUICtrl *ctrl, void *data); static void onCommitLock(LLUICtrl *ctrl, void *data);
static void onCommitPosition( LLUICtrl* ctrl, void* userdata); static void onCommitPosition( LLUICtrl* ctrl, void* userdata);
static void onCommitScale( LLUICtrl* ctrl, void* userdata); static void onCommitScale( LLUICtrl* ctrl, void* userdata);
@@ -151,6 +153,8 @@ protected:
LLSpinCtrl* mCtrlPosX; LLSpinCtrl* mCtrlPosX;
LLSpinCtrl* mCtrlPosY; LLSpinCtrl* mCtrlPosY;
LLSpinCtrl* mCtrlPosZ; LLSpinCtrl* mCtrlPosZ;
//VLife/Oynx Inspriation. IT BLINKS PRIMS TO 9001.0 METERS. HERP.
LLButton* mClickBlink;//[SimmanFederal]
LLTextBox* mLabelSize; LLTextBox* mLabelSize;
LLSpinCtrl* mCtrlScaleX; LLSpinCtrl* mCtrlScaleX;

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

@@ -910,7 +910,10 @@
<combo_item name="Cylinder" value="Cylinder"> <combo_item name="Cylinder" value="Cylinder">
Cylinder Cylinder
</combo_item> </combo_item>
</combo_box> </combo_box><!-- [SimmanFederal] Blink Button -->
<button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="Blink" label_selected="Blink" left="200"
mouse_opaque="true" name="button blink" scale_image="TRUE" width="60" />
</panel> </panel>
<!-- Features sub-tab --> <!-- Features sub-tab -->