aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-05-25 23:16:00 +1000
committerDavid Walter Seikel2013-05-25 23:16:00 +1000
commit50dc3e705bb2cc7552a2c23683cf6b9ed94711a5 (patch)
tree38be5fb7568982bf109852271acad3a331fd492a
parentDump hotkeys for obscure debugging stuff, to free them up for other things. (diff)
downloadmeta-impy-50dc3e705bb2cc7552a2c23683cf6b9ed94711a5.zip
meta-impy-50dc3e705bb2cc7552a2c23683cf6b9ed94711a5.tar.gz
meta-impy-50dc3e705bb2cc7552a2c23683cf6b9ed94711a5.tar.bz2
meta-impy-50dc3e705bb2cc7552a2c23683cf6b9ed94711a5.tar.xz
White space cleanups.
-rw-r--r--linden/indra/newview/lltoolcomp.h24
-rw-r--r--linden/indra/newview/qtoolalign.cpp10
2 files changed, 14 insertions, 20 deletions
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index 81ed0ba..b7ec940 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -113,8 +113,8 @@ public:
113 virtual ~LLToolCompInspect(); 113 virtual ~LLToolCompInspect();
114 114
115 // Overridden from LLToolComposite 115 // Overridden from LLToolComposite
116 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 116 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
117 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); 117 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
118 118
119 static void pickCallback(const LLPickInfo& pick_info); 119 static void pickCallback(const LLPickInfo& pick_info);
120}; 120};
@@ -150,9 +150,9 @@ public:
150 virtual ~LLToolCompScale(); 150 virtual ~LLToolCompScale();
151 151
152 // Overridden from LLToolComposite 152 // Overridden from LLToolComposite
153 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 153 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
154 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); 154 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
155 virtual BOOL handleHover(S32 x, S32 y, MASK mask); 155 virtual BOOL handleHover(S32 x, S32 y, MASK mask);
156 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool 156 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool
157 virtual void render(); 157 virtual void render();
158 158
@@ -172,9 +172,9 @@ public:
172 virtual ~LLToolCompRotate(); 172 virtual ~LLToolCompRotate();
173 173
174 // Overridden from LLToolComposite 174 // Overridden from LLToolComposite
175 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 175 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
176 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); 176 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
177 virtual BOOL handleHover(S32 x, S32 y, MASK mask); 177 virtual BOOL handleHover(S32 x, S32 y, MASK mask);
178 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); 178 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
179 virtual void render(); 179 virtual void render();
180 180
@@ -195,14 +195,14 @@ public:
195 virtual ~LLToolCompCreate(); 195 virtual ~LLToolCompCreate();
196 196
197 // Overridden from LLToolComposite 197 // Overridden from LLToolComposite
198 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 198 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
199 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); 199 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
200 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); 200 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
201 201
202 static void pickCallback(const LLPickInfo& pick_info); 202 static void pickCallback(const LLPickInfo& pick_info);
203protected: 203protected:
204 LLToolPlacer* mPlacer; 204 LLToolPlacer* mPlacer;
205 BOOL mObjectPlacedOnMouseDown; 205 BOOL mObjectPlacedOnMouseDown;
206}; 206};
207 207
208 208
@@ -220,7 +220,7 @@ public:
220 virtual ~LLToolCompGun(); 220 virtual ~LLToolCompGun();
221 221
222 // Overridden from LLToolComposite 222 // Overridden from LLToolComposite
223 virtual BOOL handleHover(S32 x, S32 y, MASK mask); 223 virtual BOOL handleHover(S32 x, S32 y, MASK mask);
224 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 224 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
225 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); 225 virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
226 virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); 226 virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp
index 3fe31f7..cb32d0d 100644
--- a/linden/indra/newview/qtoolalign.cpp
+++ b/linden/indra/newview/qtoolalign.cpp
@@ -46,7 +46,6 @@ QToolAlign::~QToolAlign()
46} 46}
47 47
48 48
49
50BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask) 49BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
51{ 50{
52 if (mHighlightedAxis != -1) 51 if (mHighlightedAxis != -1)
@@ -105,7 +104,6 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info)
105} 104}
106 105
107 106
108
109void QToolAlign::handleSelect() 107void QToolAlign::handleSelect()
110{ 108{
111 // no parts, please 109 // no parts, please
@@ -207,7 +205,6 @@ BOOL QToolAlign::handleHover(S32 x, S32 y, MASK mask)
207} 205}
208 206
209 207
210
211void setup_transforms_bbox(LLBBox bbox) 208void setup_transforms_bbox(LLBBox bbox)
212{ 209{
213 // translate to center 210 // translate to center
@@ -242,6 +239,7 @@ void render_bbox(LLBBox bbox)
242 gGL.popMatrix(); 239 gGL.popMatrix();
243} 240}
244 241
242
245void render_cone_bbox(LLBBox bbox) 243void render_cone_bbox(LLBBox bbox)
246{ 244{
247 glMatrixMode(GL_MODELVIEW); 245 glMatrixMode(GL_MODELVIEW);
@@ -256,7 +254,6 @@ void render_cone_bbox(LLBBox bbox)
256} 254}
257 255
258 256
259
260// the selection bbox isn't axis aligned, so we must construct one 257// the selection bbox isn't axis aligned, so we must construct one
261// should this be cached in the selection manager? yes. 258// should this be cached in the selection manager? yes.
262LLBBox get_selection_axis_aligned_bbox() 259LLBBox get_selection_axis_aligned_bbox()
@@ -288,7 +285,6 @@ LLBBox get_selection_axis_aligned_bbox()
288} 285}
289 286
290 287
291
292void QToolAlign::computeManipulatorSize() 288void QToolAlign::computeManipulatorSize()
293{ 289{
294 if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD) 290 if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
@@ -407,6 +403,7 @@ void QToolAlign::render()
407 } 403 }
408} 404}
409 405
406
410// only works for our specialized (AABB, position centered) bboxes 407// only works for our specialized (AABB, position centered) bboxes
411BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2) 408BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
412{ 409{
@@ -422,7 +419,6 @@ BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
422} 419}
423 420
424 421
425
426// used to sort bboxes before packing 422// used to sort bboxes before packing
427class BBoxCompare 423class BBoxCompare
428{ 424{
@@ -598,5 +594,3 @@ void QToolAlign::align()
598 594
599 LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION); 595 LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
600} 596}
601
602