Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,335 Commits 20 Branches 51 Tags
89e7decc12ccbe3b030d3efa5059bb809288529e
Commit Graph

62 Commits

Author SHA1 Message Date
Lirusaito
f48eca366a Issue 773: Add option to update currently worn outfit 2013-05-08 00:47:55 -04:00
Shyotl
76f3dc9e19 Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback. 2013-02-19 01:50:46 -06:00
Latif Khalifa
d8c846288e Merge remote-tracking branch 'lirusato/master' 2013-01-22 20:06:03 +01:00
Lirusaito
dd1e9a68d4 Removal of the deprecated lltabcontainervertical. 2013-01-22 01:38:25 -05:00
Shyotl
e622e03d2a Bulk of server-baking impelmentation and a bit of cleanup. 2013-01-13 02:37:12 -06:00
Shyotl
54771409d6 Merge branch 'master' into sunshine 
Conflicts:
	indra/llimage/llimage.cpp
	indra/llui/llui.cpp
	indra/newview/llvoavatar.cpp
 2013-01-08 17:05:29 -06:00
Shyotl
9596514c79 Dragged over lltexlayer, lldriverparam, lllocaltextureobject, llwearabledata 2013-01-04 20:50:35 -06:00
Lirusaito
2c491bc905 Break out LLMakeOutfitDialog. 
Added "Make Outfit..." to Edit menu and Create->"New Outfit" to inventory floater menu.
Cleaned up LLMakeOutfitDialog, using boost::bind and less waste.
Moved onMakeOutfitCommit() to LLMakeOutfitDialog as makeOutfit()
Also changes LLFloaterCustomize's callbacks to use boost::bind
Give new outfit dialog a title instead of a heading.

Small fix to mistake with AnnounceSnapshots xmlstuffs.
 2012-12-29 19:24:17 -05:00
Shyotl
e08afcb963 Created llappearance project. Migrated llvoavatardefines and llwearabletype. 2012-12-20 00:00:17 -06:00
Shyotl
4c45e9a9d1 Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals. 2012-06-15 09:51:11 -05:00
Shyotl
891d6d3448 Interim work on appearance editor. 2012-06-11 04:54:54 -05:00
Shyotl
fb1594535e Intermediate step in refactoring appearance panel 2012-06-02 17:32:19 -05:00
Shyotl
dbe50efc10 Added 'make outfit' back to appearance editor. 2012-05-16 23:25:01 -05:00
Shyotl
6b66c33b47 Killed some redundant code in customize floater. 2012-04-21 20:44:10 -05:00
Shyotl
500135941a Modernized lluictrl. Added LLViewModel. Fixed focus callbacks being called excessively. Updated LLButton, and implemented boost::signals2 to replace old callback handling. 2012-03-02 16:57:33 -06:00
Shyotl
323ec8cf59 Updated customize floater to work with layer 0 wearable, for now. 2012-02-23 04:00:09 -06:00
Shyotl
bdeead6f8e Updated LLView: 
-Removed a few extra unneeded virtuals
 -Pulled tabgroups out of llpanel and into LLView
 -removeChild doesn't support delete. Delete manually.
 -addChildAtEnd renamed to addChildInBack
 -getScreenRect renamed to calcScreenRect
 -added calcScreenBoundingRect and calcBoundingRect(which updateBoundingRect calls
 -General cleanup. Someone at LL figured out that dynamic_cast actually exists.
Fixed PieMenu not reliably centering on cursor.
Fixed context menu crash in line and text editors.
Classes with LLEditMenuHandler as a base do not need to set gEditMenuHandler to NULL, since LLEditMenuHandler's dtor does that already!
 2012-02-21 21:59:22 -06:00
Shyotl
ae7b12f230 Interim commit before diving into reworking the inventory panel. 2012-02-16 19:25:59 -06:00
Shyotl
a90d7bbb46 Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables. 2012-02-16 12:00:38 -06:00
Shyotl
51746dc751 Added wearable index handling to LLAgentWearables to scope out further changes. Index is still always zero for now, so behavior should not have changed. (marked with // TODO: MULTI-WEARABLE) 2012-01-21 19:02:19 -06:00
Shyotl
4a4b786a60 New inventory observer implementation. 2012-01-21 04:54:39 -06:00
Lirusaito
9d3b276f61 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-12 23:39:16 -05:00
Shyotl
1cc33caaa3 Pulled llinventorymodel apart into llinventorymodel, llinventoryobserver and llinventoryfunctions 2012-01-12 18:57:10 -06:00
Lirusaito
61beedd3d9 Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights 
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
 2012-01-09 05:40:03 -05:00
Shyotl
83e8a9076b Several gl calls now wrapped via LLRender (gGL) as prep for future changes: 
glMatrixMode -> gGL.matrixMode
..GL_MODELVIEW -> LLRender::MM_MODELVIEW
..GL_POJECTION -> LLRender::MM_PROJECTION
..GL_TEXTURE -> LLRender::MM_TEXTURE
glMultMatrix -> gGL.multMatrix
glLoadMatrixf -> gGL.loadMatrix
glPushMatrix -> gGL.pushMatrix
glPopMatrix -> gGL.popMatrix
glLoadIdentity -> gGL.loadIdentity
glRotatef -> gGL.rotatef
glTransformf -> gGL.transformf
glOrtho -> gGL.ortho
glColor3f -> gGL.diffuseColor3f
glColor3fv -> gGL.diffuseColor3fv
glColor4f -> gGL.diffuseColor4f
glColor4fv -> gGL.diffuseColor4fv
glColor4ubv -> gGL.diffuseColor4ubv
glLightModelfv(GL_LIGHT_MODEL_AMBIENT -> gGL.
 2011-11-21 15:55:44 -06:00
Shyotl
d88f696604 Brought over LLInventoryIcon 2011-10-18 19:44:08 -05:00
Shyotl
008bebd817 Merge with siana/future 2011-10-13 00:03:56 -05:00
Shyotl
c99aabf17c LLAgentWearable LLSingleton-ized. 2011-10-09 21:48:01 -05:00
Shyotl
cd86b3a69b Refactoring. 
-New LLWearableType class, uses LLDictionary for typeindex<->typename<->assettype<->typelabel conversions.
-LLAvatarDefines cleaned up. Uses LLDictionary for Mesh, TE, Baked lookups/conversions.
-LLAgentWearables TEWearable stuff removed. Use LLAvatarDefines.
-LLWearable WearableType conversions yanked. Use LLWearableType.
-LLVOAvatar TEWEarable stuff removed. Use LLAvatarDefines.
-EWearableType now LLWearableType::EType
-LLWearable::getID() renamed to LLWearable::getAssetID()
VOAvatar cleanup.
-Removed redundant TEWearable functions.
-Some code migrated to F32 LLVOAvatar::calcMorphAmount(). No functional change.
-LLVOAvatar::removeMissingBakedTextures virtual. Implementation moved to VOAvatarSelf
 2011-10-03 15:00:43 -05:00
Shyotl
74dc875a27 Beginning to pull LLVOAvatarSelf out from LLVOAvatar. 2011-10-02 02:51:10 -05:00
Shyotl
417f5084b4 Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places. 2011-09-03 19:30:42 -05:00
Siana Gearz
6348635d3f Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl) 2011-06-23 21:11:52 +02:00
Shyotl
c57b97c8df LLAgentWearables Transition (1/1) 2011-06-09 01:35:49 -05:00
Aleric Inglewood
fed8951e00 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-06-03 22:48:23 +02:00
Shyotl
49b893c806 Removed most OGPX related code. 2011-05-28 17:11:10 -05:00
Aleric Inglewood
d27abe5ed8 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-05-24 18:10:21 +02:00
Shyotl
77f09744ab Merge branch 'AlericMaster' into V2Renderer 
Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp
 2011-05-20 12:56:23 -05:00
Shyotl
7ba10207a4 Belly physics shouldn't have been set to female-only. Eups. 2011-05-18 20:19:09 -05:00
Aleric Inglewood
e1fb1fa6b7 API change of AIFilePicker. 
Call AIFilePicker::create() instead of new AIFilePicker.
Renamed deleteMe() to kill() and bs_deleted to bs_killed.
Only default to auto destruct when created with create(true),
otherwise kill() has to be called explicitely.
 2011-05-18 03:52:15 +02:00
Aleric Inglewood
41f13dbf46 Merge branch 'master' of https://github.com/siana/SingularityViewer 
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
 2011-05-14 01:06:19 +02:00
Shyotl
2c1a46c70d A stability and leak fix regarding editing physics wearables. Thanks Henri! 2011-05-13 00:36:04 +02:00
Shyotl
b6446cad10 A stability and leak fix regarding editing physics wearables. Thanks Henri! 2011-05-12 16:13:04 -05:00
Aleric Inglewood
e0b0fa4f58 Use AIFilePicker everywhere. 
Also upgrade the file picker filters with the new extensions found
in the orginal file picker code of Singularity.

Also improve AIFilePicker a bit: added hasFilename() and now
deleting the statemachine automatically by default: it's no longer
needed to call deleteMe from the callback.
 2011-05-10 04:27:57 +02:00
Shyotl
0dd3e189fc Adjusted camera positions while editing physics. Focuses and zooms in closer to location being edited. 2011-04-29 20:15:37 -05:00
Shyotl
a694742522 Added physics subpanel to avatar customize floater. 
Also, removed redundant tattoo and alpha entries.
Modified LLScrollingPanelParam to work without needing 'hints'. A bit hacky since I didn't want to dive into making yet another xml, but works well enough.
Avatar_lad entries names changed to more readable forms since LLTrans isn't where it needs to be yet.

Camera doesn't move to great positions when editing phys parts, but that's for another day.
 2011-04-29 03:39:05 -05:00
Shyotl
2dff12433c Avatar Physics innital commit. No edit panel. SavedSettings not plugged in yet. 2011-04-28 10:09:11 -05:00
Shyotl
5954e0d71c Merge branch 'master' into V2TextureSystem 
Conflicts:
	indra/newview/llfloaterexport.cpp
 2011-04-24 03:31:31 -05:00
Siana Gearz
26058999b3 TOS compliance 2011-04-19 13:59:11 +02:00
Siana Gearz
8f09dedb1e Wearable import/export, from Imprudence 2011-04-19 13:46:09 +02:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem 
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
 2011-04-12 22:29:49 -05:00