Commit Graph

69 Commits (b59b1ff3d9bc9fd32d0bca087b5a733f38f43d6b)

Author SHA1 Message Date
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
MW 0710fbb45e Fixed the missing reference to a texture in TexturesAssetSet.xml , reported 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.
2008-07-29 08:50:46 +00:00
Sean Dague f69ae29e39 remove void keyword for osWeatherMap.lsl. Update asset and inventory
uuids so that these new versions will show up in systems where they were
before.
2008-07-28 14:13:48 +00:00
Justin Clarke Casey e1b7ace453 * Try new ruth avatar settings correction suggested by jenni in http://opensimulator.org/mantis/view.php?id=1769
* Thanks jenni
2008-07-18 11:20:30 +00:00
Mike Mazur 2558f8ac31 Make scripts LSL compliant. 2008-07-18 04:51:36 +00:00
Justin Clarke Casey 1187cd0d3d * elminate now pointless inv type fields from OpenSim library xml 2008-07-02 16:34:24 +00:00
Jeff Ames e9a61e7c74 Update svn properties. 2008-06-23 05:15:30 +00:00
Sean Dague 0c84c27265 content fridays. A whole bunch of new stock animations from Mo Hax
at IBM for distribution with OpenSim.
2008-06-20 20:09:22 +00:00
Charles Krinke 0fe5c5eadf Mantis#1566. Thank you kindly for a number of
sounds for the OpenSim library.
2008-06-19 03:30:13 +00:00
Sean Dague 33c40c0e0d typo in xml 2008-06-18 23:06:02 +00:00
Sean Dague 6753578465 commit justin's grafitti board to the base OpenSim script
library.
2008-06-18 22:56:04 +00:00
Sean Dague b57b24655c contribute weather map cycling script using osDynamicTextures. 2008-06-18 19:38:30 +00:00
Sean Dague 7355d79881 prune all the empty script directories. Contribute
my text board script to be part of the stock scripts.
2008-06-18 19:23:46 +00:00
Sean Dague 987c7498c3 the first pass at Asset Fridays. Contribution of a handshake
animation from Mo Hax at IBM.  This took us a while to sort out
the conversion path, expection more efficiency in the future.
2008-06-13 19:15:27 +00:00
Sean Dague cdc4061426 rename to index.xml just to make this more consistant 2008-06-13 18:20:30 +00:00
lbsa71 7ef240e01e * Applied patch #681 from tyre
* This fixes three broken default assets
Thanks, tyre!
2008-03-07 14:56:07 +00:00
Jeff Ames 20215c3d30 Rewrote svn properties handling script in python. Added more file types. 2008-01-26 10:34:49 +00:00
alondria 6108f1529f Changed URL in example to avoid RIAA issues. 2008-01-12 07:06:23 +00:00
Justin Clarke Casey 3ab0007d3e Minor spelling change on NotecardsAssetSet.xml. The example notecard should now load up properly 2008-01-10 00:49:31 +00:00
Jeff Ames 82af9b7a78 Set svn:eol-style. 2008-01-09 23:28:50 +00:00
Brian McBee 19ed64b114 Third part of CharlieO's library rework. We now have library organization! Thanks CharlieO! 2008-01-09 03:52:07 +00:00
Brian McBee 35b0c2e9df More inventory work for CharlieO. Final patch to make it all work yet to come. 2008-01-07 01:03:46 +00:00
Brian McBee a14d9500de For CharlieO: new folders created for new asset set stuff. Mantis 313 2008-01-06 20:27:57 +00:00
Justin Clarke Casey b8975ecbd9 Make it possible for new inventory 'libraries' to be added without changing the default OpenSimLibrary files. Additional library folders and items can be added in a separate
directory 
and linked in by an entry to inventory/Libraries.xml
2007-12-31 23:20:49 +00:00