aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/TexturesAssetSet (follow)
Commit message (Collapse)AuthorAgeFilesLines
* bad merge?UbitUmarov2015-09-011-0/+0
|\
| * Merge branch 'master' into careminsterMelanie2013-06-302-0/+12
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * \ Merge branch 'master' into careminsterMelanie2011-12-142-6/+0
| |\ \
| * \ \ Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-112-0/+7
| |\ \ \
| * \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs
| * \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-292-1/+1
| |\ \ \ \ \
| * | | | | | Add my work on top of cmickeyb'sMelanie2010-10-291-0/+6
| | | | | | |
| * | | | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e6a8d2872c3ff4992cd7e9615f69e0c6773e461f.
| * | | | | | Add a default alpha layerMelanie2010-10-291-0/+0
| | | | | | |
| * | | | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-0/+6
| | | | | | |
* | | | | | | Add missing default female hair texture for Ruth avatar.Justin Clark-Casey (justincc)2014-07-242-0/+6
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was not in library assets despite being referred to in assets/BodyPartsAssetSet/base_hair.dat Texture ID is 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b Taken from https://github.com/openmetaversefoundation/simiangrid/blob/master/Grid/default_assets/Default%20Female%20Hair-7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c
* | | | | | Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.Justin Clark-Casey (justincc)2013-06-282-0/+12
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes stars appear more realistically rather than as massive chunks due to the missing IMG_BLOOM1 asset from the viewer. Thanks to YoshikoFazuku for supplying the star asset which I then uploaded via a viewer and extracted as JPEG2000. Thanks also to Ai Austin for helping this process along. See http://opensimulator.org/mantis/view.php?id=6691 for more details.
* | | | | Get rid of the 'lolcat' library asset.Justin Clark-Casey (justincc)2011-12-122-6/+0
| |_|_|/ |/| | | | | | | | | | | This was both unused and an invalid jpeg2000 texture from way back in 2008
* | | | Write code to create minimum necessary body parts/clothing and avatar ↵Justin Clark-Casey (justincc)2011-09-152-0/+7
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entries to make a newly created user appear as a non-cloud on viewer 2 Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries. Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim. Default is currently off. My intention is to switch it on for standalone shortly. This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities. Need to fix creation of suitable entries for users created as estate owners on standalone. Avatars still appear with spooky empty eyes, need to see if we can address this. This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used.
* | | Make UUID 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 reference a full alpha texture.Justin Clark-Casey (justincc)2011-02-031-0/+9
| |/ |/| | | | | | | | | | | | | SL's viewer and some downstream projects assume that this UUID points to a full alpha texture, as per http://opensimulator.org/mantis/bug_view_advanced_page.php?bug_id=4751 and http://forums.kokuaviewer.org/viewtopic.php?f=8&t=1323 If the request isn't satified, some viewers will continuously make the request.
* | Rename the new default texture to be consistent with the othersMelanie2010-10-292-1/+1
| |
* | Add a default alpha layerMelanie2010-10-291-0/+0
| |
* | Add my work on top of cmickeyb'sMelanie2010-10-291-0/+6
| |
* | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-6/+0
| | | | | | | | | | | | This work conflicts with cmickeyb's more extensive, related work This reverts commit 9c829c0410da89fdbb873f706d7ba63cf26b088f.
* | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-0/+6
|/
* One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943.Diva Canto2010-08-182-327/+327
| | | | (Files .xml and .txt also want to be committed)
* Add textures no longer shipped with newer viewers to OpenSim's standard ↵Justin Clark-Casey (justincc)2010-08-1845-0/+338
| | | | | | | asset library These are appropriately licensed and include plant, tree and miscellaneous textures (face target crosshairs, etc). Many thanks to Nebadon for sourcing and packaging these.
* Added image for hyperlink map tiles.Diva Canto2010-01-252-0/+6
|
* * Rewrote LLImageManager to use a real priority queue and hold minimal stateJohn Hurliman2009-10-012-0/+7
| | | | | * Rewrote the logic in J2KImage.RunUpdate() * Added a default avatar texture (I made it myself)
* Thanks jonc for a new and better cloud image (for classic clouds).Homer Horwitz2009-04-041-0/+0
| | | | | Fixes Mantis #964. Please remember to clear the viewer cache.
* Implement missing LSL TEXTURE_xxx constants including two new textures.idb2009-01-223-0/+14
| | | | | Fixes Mantis #3030
* Add the "Blank" texture, too.Homer Horwitz2009-01-052-0/+7
| | | | | | NOTE: I didn't mention that in my last checkin, but you'll have to clear your viewer cache to see the new textures in the library.
* Added viewer's default terrain textures.Homer Horwitz2009-01-055-0/+25
| | | | | This fixes Mantis #2947. Thanks jhurliman
* Fixed the missing reference to a texture in TexturesAssetSet.xml , reported ↵MW2008-07-291-0/+8
| | | | | | | in mantis 1848. Not sure why the ids on some textures had got changed in there and the reference to femalebody.jp2 removed. I don't think this is the only problem with avatar appearances though, as I've still seen the puffs of smoke even with that texture set correctly. Seems that anytime where before you would have seen a grey ruth, you now get a puff of smoke. So looks like a urgent drive is needed to fix the avatar appearance system.
* * elminate now pointless inv type fields from OpenSim library xmlJustin Clarke Casey2008-07-021-66/+0
|
* * Applied patch #681 from tyrelbsa712008-03-073-0/+0
| | | | | | * This fixes three broken default assets Thanks, tyre!
* Set svn:eol-style.Jeff Ames2008-01-093-457/+457
|
* More inventory work for CharlieO. Final patch to make it all work yet to come.Brian McBee2008-01-0714-0/+421
|
* For CharlieO: new folders created for new asset set stuff. Mantis 313Brian McBee2008-01-0662-0/+40