OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,314 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

92 Commits (618c6ceda514190924e8003d4ee895f3e2e9f0cc)

Author SHA1 Message Date
UbitUmarov 7554e62861 add a sound 2018-11-30 22:03:30 +00:00
lickx 94a5e5b9b7 Add non-transparent water asset 
Used by all viewers when 'Transparent Water' is unchecked in the viewer
prefs

Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2018-10-20 19:58:22 +01:00
UbitUmarov e075b349ce new try on smoke texture 2018-08-27 15:12:24 +01:00
Fly Man d9028ac07f Adjusted Smoke texture 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2018-08-27 11:51:03 +01:00
UbitUmarov 14f55ab36e fix smoke asset filename 2018-08-26 01:33:49 +01:00
UbitUmarov 10e4d01375 remove a comment 2018-08-26 01:01:17 +01:00
fly-man- d3d915ce3c Patching in the Smoke for Mantis 8242 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2018-08-26 00:54:32 +01:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Justin Clark-Casey (justincc) 086bc6f748 Add missing default female hair texture for Ruth avatar. 
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
 2014-07-24 20:03:19 +01:00
Melanie 4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Justin Clark-Casey (justincc) 70dd4cf152 In library inventory, correct asset id for llSay example script 
From http://opensimulator.org/mantis/view.php?id=6917
Thanks to FreakyTech for this spot.
 2014-01-10 20:51:28 +00:00
Melanie ffcee82b1d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2013-06-30 18:27:30 +01:00
Justin Clark-Casey (justincc) 4406f07a84 Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars. 
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.
 2013-06-28 23:34:16 +01:00
Melanie 26cc57b6ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
 2012-10-26 21:13:01 +01:00
Oren Hurvitz 424f68b64b Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xml 2012-10-25 23:30:48 +01:00
Melanie 39cb2063bf Add collision sounds to the asset set 2012-06-07 23:35:08 +01:00
Melanie 354ac8c978 Add collision sounds to the asset set 2012-06-07 19:02:43 +02:00
Melanie 898549d13e Merge branch 'master' into careminster 2011-12-14 08:57:55 +00:00
Justin Clark-Casey (justincc) 3a06640730 Get rid of the 'lolcat' library asset. 
This was both unused and an invalid jpeg2000 texture from way back in 2008
 2011-12-12 21:17:01 +00:00
Melanie 117d24be54 Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge 2011-10-11 21:45:01 +01:00
Melanie 9d22110c23 Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge 2011-10-11 21:22:58 +01:00
Justin Clark-Casey (justincc) c38b25a1d2 Fix base_hair.dat to actually contain the base hair asset rather than base eyes by mistake. 
I must have had it cached last night.
This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database).
As a bonus, eyes now appear by default too!
 2011-09-16 21:43:58 +01:00
Justin Clark-Casey (justincc) c4efb97d49 Write code to create minimum necessary body parts/clothing and avatar 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.
 2011-09-15 22:59:29 +01:00
Melanie 3889e68c54 Merge branch 'master' into careminster-presence-refactor 
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
 2011-02-07 22:08:53 +00:00
Justin Clark-Casey (justincc) c1665cfe9c Make UUID 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 reference a full alpha texture. 
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.
 2011-02-03 22:34:10 +00:00
Melanie 69c1e0b2f7 Merge branch 'master' into careminster-presence-refactor 2010-10-29 21:22:35 +01:00
Melanie 4f39329d6f Rename the new default texture to be consistent with the others 2010-10-29 21:10:19 +01:00
Melanie 32e5bee3a7 Add a default alpha layer 2010-10-29 21:09:31 +01:00
Melanie 5f4badf9e2 Add my work on top of cmickeyb's 2010-10-29 20:44:29 +01:00
Melanie e6fe83cd93 Revert "Preliminary work on appearance layers. No user functionality yet." 
This work conflicts with cmickeyb's more extensive, related work

This reverts commit 9c829c0410.
 2010-10-29 20:17:59 +01:00
Melanie 840b75ca9b Add my work on top of cmickeyb's 2010-10-29 20:48:37 +02:00
Melanie 3231602b88 Revert "Preliminary work on appearance layers. No user functionality yet." 
This reverts commit e6a8d2872c.
 2010-10-29 20:34:53 +02:00
Melanie bd4e3b0aaf Add a default alpha layer 2010-10-29 20:31:17 +02:00
Melanie 9c829c0410 Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:58:22 +01:00
Melanie e6a8d2872c Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:59:53 +02:00
Diva Canto e47608fc62 One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. 
(Files .xml and .txt also want to be committed)
 2010-08-18 16:22:50 -07:00
Justin Clark-Casey (justincc) 11db33d520 Add textures no longer shipped with newer viewers to OpenSim's standard 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.
 2010-08-18 23:15:05 +01:00
Diva Canto b1b9ac2e74 Added image for hyperlink map tiles. 2010-01-25 09:08:57 -08:00
John Hurliman 6e0c79b8fe * Rewrote LLImageManager to use a real priority queue and hold minimal state 
* Rewrote the logic in J2KImage.RunUpdate()
* Added a default avatar texture (I made it myself)
 2009-10-01 17:42:13 -07:00
Diva Canto 07a9d9f2e9 Deleted assets/OpenSimAssetSet, because it had 6M of data that was not being used anywhere. 2009-09-06 18:29:37 -07:00
Homer Horwitz 13128c4e9d Thanks jonc for a new and better cloud image (for classic clouds). 
Fixes Mantis #964. Please remember to clear the viewer cache.
 2009-04-04 15:43:16 +00:00
idb 757762a630 Implement missing LSL TEXTURE_xxx constants including two new textures. 
Fixes Mantis #3030
 2009-01-22 23:58:46 +00:00
Justin Clarke Casey fb8faa8336 * Apply http://opensimulator.org/mantis/view.php?id=2913 
* Add the KanEd scripts to the standard library
* Thanks Fly-Man-
 2009-01-12 18:00:46 +00:00
Homer Horwitz bf65290062 Add the "Blank" texture, too. 
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.
 2009-01-05 20:24:42 +00:00
Homer Horwitz a04560cf0c Added viewer's default terrain textures. 
This fixes Mantis #2947. Thanks jhurliman
 2009-01-05 19:59:29 +00:00
Justin Clarke Casey 7823ca5c8b * minor: Stop startup complaining about a missing MyAssetSet.xml all the time by creating a blank file 2008-11-28 21:12:20 +00:00
Dr Scofield e2abd2bf55 From: Alan Webb (alan_webb@us.ibm.com) 
missing Gesture .dat files to accompany the previous check-in.
 2008-10-20 18:23:53 +00:00
Dr Scofield 12640b8d78 From: Alan Webb (alan_webb@us.ibm.com) 
Fixing types of gestures and animations.
 2008-10-20 18:11:05 +00:00
Charles Krinke 77ae4bb3fb Mantis#1971. Thank you kindly, ChrisDown for a patch that: 
Reverts the deletion of the entry for "My Site Library" in 
bin/assets/AssetSets.xml and replace with with "Open Textures Library" 
pointing to "OpenTexturesLibrary/3DDCInventoryItems.xml"/.
 2008-08-17 19:40:30 +00:00
Charles Krinke 60a676251a Mantis#1971. Thank you kindly, BlueWall for a patch that: 
The included patch enable handling for PRIM_FULLBRIGHT in 
llSetPrimitiveParams().
 2008-08-16 21:31:36 +00:00