Latif Khalifa
8584e6da4c
Merge branch 'master' into meshupload
...
Conflicts:
indra/llcommon/llhash.h
indra/newview/CMakeLists.txt
indra/newview/llfloatermodelpreview.cpp
indra/newview/llfloatermodelpreview.h
indra/newview/llpanelprofile.h
2013-01-30 00:36:31 +01:00
Aleric Inglewood
da19e770a2
Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT
2013-01-07 20:11:18 +01:00
Shyotl
1083d7e0ef
Added LLGLTexture. Virtually completely virtual for now. Also added LLTextureManagerBridge, although not yet utilized.
2012-12-22 23:58:42 -06:00
Shyotl
9fb4e677a6
Updates to LLScrollListCtrl and related inter-dependencies. Also added ability to set face texture to 'None' (LLUUID::null).
2012-12-08 00:56:58 -06:00
Shyotl
ef27cc54dd
Fixed unsafe erasure from vector while iterating in llinventorybackup.cpp.
2012-10-22 02:56:41 -05:00
Shyotl
2bf940e15d
Fixed up inventory filter. Basic folders now have an 'open' icon. Tweaked the indent size for inventory (looks a little nicer imo)
2012-02-27 02:53:12 -06: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
417f5084b4
Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places.
2011-09-03 19:30:42 -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
a6cb676d4a
Add AIDirPicker and use it. Remove indra/newview/ll{dir,file}picker.{h,cpp}.
...
Also removed some code from the Mac/windows code in
indra/plugins/filepicker/llfilepicker.cpp that shouldn't
be in there anymore (send_agent_pause/resume and updating
the LLFrameTimer stuff).
2011-05-11 03:01:34 +02: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
2dff12433c
Avatar Physics innital commit. No edit panel. SavedSettings not plugged in yet.
2011-04-28 10:09:11 -05:00
Shyotl
e756140e1d
Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
...
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
siana
baac16b5d2
OpenJPEG experiment, PCH circumcision
2011-03-20 04:44:58 +01:00
Hazim Gazov
6328987264
start to add names to the map, inv backup fixes
2010-05-19 20:52:50 -03:00
Hazim Gazov
bd7ea26ab0
don't you be reverting my changes, boy
2010-05-16 02:43:17 -03:00
Hazim Gazov
c58918a100
start to add always fly, remove opensim rules because they are dumb
2010-05-16 02:41:44 -03:00
Apelsin
65ef5ab6e3
Hex editor is a cat face
2010-05-15 22:33:37 -07:00
Hazim Gazov
7df897c585
rename the DOInventoryBackup class back to the original for consistency with the other sourcebase, fix Imprudence tag to be purple (as it should be)
2010-05-13 07:11:00 -03:00
Hazim Gazov
f4857c6afb
adding some floaters I forgot
2010-04-23 10:17:08 -03:00
