Commit Graph

90 Commits (e925b0654d12c534ff9f837355ad43483dbd22cb)

Author SHA1 Message Date
Jeff Ames 6ef9d4da90 Formatting cleanup. 2008-08-18 00:39:10 +00:00
Justin Clarke Casey fd4e703f25 * Remove dumb bug I put in which meant that an archive save would never complete if there were any missing assets 2008-07-25 15:18:24 +00:00
Sean Dague 6084a7ea3e Revert "git merge"
This reverts commit 80e1c3742a3ba7eb9aa1686a242b36f64331095a.
2008-07-17 18:59:10 +00:00
Sean Dague dd144e12ba git merge 2008-07-17 18:59:06 +00:00
Sean Dague 0a01be9a86 more safety checks 2008-07-17 18:59:01 +00:00
Sean Dague db9e6584bf add a null check for safety 2008-07-17 18:58:58 +00:00
Sean Dague d9523b4e1a change fields to private so everyone will use properties 2008-07-16 15:18:13 +00:00
Sean Dague f3173735fa Revert "refactoring of PrimitiveBaseShape to properties"
This reverts commit 60e13a9997da89d224fbe8a97ab42bfc6114a45f.
2008-07-16 15:10:35 +00:00
Sean Dague 1e447478b8 refactoring of PrimitiveBaseShape to properties 2008-07-16 14:41:57 +00:00
Sean Dague e2d02cbf65 further property refactoring of PrimitiveBaseShape 2008-07-16 14:41:53 +00:00
Sean Dague c6b1a190bc refactoring primitive base shape to use properties 2008-07-16 14:41:49 +00:00
Dr Scofield feb30217de dr scofield's warning safari:
* commented out [Obsolete(....)] attributes where no replacement feature
  was available: if we want to attribute code that we think needs to be 
  reworked, we should define a new attribute and use that instead 
  (together with a little tool to retrieve all the attributed code then)
* commenting out unused variables
2008-06-27 16:58:21 +00:00
Charles Krinke c4641d7005 Mantis#1584. Thank you kindly, Lulurun for a patch that:
The (de)serialization of extraparams is wrong.
prims with scuplt texture won't be seen as it expected.
This patch fixes the problem .
2008-06-25 13:55:06 +00:00
Charles Krinke 786fd3534d Mantis#1572. Thank you kindly, Lulurun for a patch that addresses:
In function "ReadInExtraParamsBytes", parameter "data" is used without a boundary check.
if data.Length==0, an "out of index" exception will be thrown.
2008-06-19 21:00:09 +00:00
Justin Clarke Casey cb70299092 * Fix a bug in the archiver where I didn't realize a shape still needs its default texture as well as its face textures 2008-06-16 22:43:30 +00:00
Jeff Ames 5d77625e9a Update svn properties. Formatting cleanup. 2008-05-25 23:27:38 +00:00
Justin Clarke Casey 42ac35ba7d * Provide relief for mantis 1263, 1202, 679
* If a caller attempts to set PrimitiveBaseShape.ProfileCurve with a HollowShape or ProfileShape component which is not a valid enum, a warning is spat out and a default shape 
subtituted
* This does not solve any underlying problem if we're missing some enum values (though it's not obvious what these are), but it should allow save-xml2/load-xml2 to be used 
without causing invalid enum value related exceptions.  The checks will also guard against badly behaved clients.
* This change alters the order of shape values in the xml, since it appears properties are serialized after fields (at least this is the case in mono).  .net native 
deserialization can cope with this it appears, though people manipulating xml manually may need to adapt (if there are any).
* This may be a good argument against relying on .net [de]serialization for our xml format.
2008-05-21 22:17:28 +00:00
Teravus Ovares e57c2b47a8 * This fixes the Sculpty seam. Unfortunately not all sculpties will survive. A tiny fraction of them will turn into a torus. 2008-05-18 21:05:48 +00:00
Teravus Ovares 7e275bfa37 * Wrote a method to get the OpenJpeg data of a sculpt texture asset and save it to the prim shape.
* Added some stuff around sculpted prim meshes..   but it's just there so the project compiles now.
2008-05-09 01:28:54 +00:00
Teravus Ovares 646df0dc2c * remove 2 warnings. 2008-05-08 20:45:50 +00:00
Teravus Ovares 4b924f2eb6 * Committing an extra bit of permissions for attaching to ensure that the perms are in line with project goals. 2008-05-08 19:22:20 +00:00
Teravus Ovares 92c03978e1 * Fixes Prim ExtraParams
* Fixes Sculpty handling
* Fixes Light handling
* Fixes Flexi handling
* Fixes Sculpty + Flexi handling
* Fixes handling of Flexi type
* Fixes Changing prim type after changing to sculpty corrupting prim.
* Ugly code.
2008-05-08 04:58:44 +00:00
Adam Frisby 375163a6fe * Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
2008-04-29 14:04:55 +00:00
Jeff Ames 47180080f0 Formatting cleanup. 2008-03-18 05:16:43 +00:00
Jeff Ames 7d1dcf3e68 Replaced some magic PCode numbers with enum values. 2008-03-17 17:23:49 +00:00
Jeff Ames a8cfbbe963 Minor cleanup. 2008-02-20 18:38:20 +00:00
lbsa71 2f023f6362 * removed unused PrimScale on PrimitiveBaseShape (use Scale instead)
* ignored bin
2008-01-10 13:37:59 +00:00
lbsa71 690a7a347b * Undid XmlIgnore thingy as it did cause breakage 2008-01-10 12:07:49 +00:00
lbsa71 ed314e19ff * Sorted members for great justice 2008-01-10 11:17:26 +00:00
lbsa71 f1c2dca7c1 * ProfileCurve is now XmlIgnored, and instead constructed from ProfileShape and ProfileHollow 2008-01-10 08:56:03 +00:00
lbsa71 b469990972 * Added helpers to convert from LSL PrimitiveParams values to PrimitiveBaseShape values 2008-01-09 18:26:40 +00:00
lbsa71 8cd72beb86 * Moved PrimitiveBaseShape subclasses into factory methods - the subclassing scheme won't hold for serialization
* Extracted out the 'old' AddNewPrimitive that places an object at an exact pos, without the raytracing
2007-12-28 08:34:38 +00:00
Teravus Ovares 5bd5770ed2 * Patch from Melanie. Thanks Melanie!
* This patch addresses a regression where 5 default textures, including the default "new prim" texture, would not be shown unless in viewer cache.
* Further, it supplies a new plywood texture as the base texture, which is purpose-made from locally photo-sourced material (means i took a picture and made it into a tile), which is closer in appearance and color to the Linden one.
* It changes the default new prim texture UUID to match the UUID generated by the viewer when "default" is clicked, which is a texture UUID hardcoded in some scripts as well, so it would cause compatibility issues if not addressed.
* The patch fixes a number of UUID duplications (same UUID for asset and inventory items) and capitalization issues in the XML files.
* It also includes new versions of 4 other textures, which were no longer loadable in grid mode.
2007-12-28 05:36:28 +00:00
lbsa71 efd90b56b7 * Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
2007-12-27 21:41:48 +00:00
lbsa71 87e2a694e2 * AssetServerBase: _ProcessRequest is now called GetAsset
* PrimitiveBaseShape: The textures are now exposed as a 'TextureEntry Textures'; all serialization still using the 'byte[] TextureEntry' for backwards compatibility.
* Scene: Re-added AddTree, since the Tree type isn't gone from libsl, merely relocated.
2007-12-27 14:00:30 +00:00
lbsa71 1cf4278862 * Debugging Shape
* Adding namesetting to Create
2007-12-13 14:47:44 +00:00
MW 909fcd554f A few minor changes/additions/fixes. 2007-12-11 16:05:53 +00:00
lbsa71 ffd60baa48 * The 'Create' functions should be called to factor up a new, otherwise empty, but with the Id and 1-to-1 child fields instantiated and randomized.
* Added two shape constants that
2007-12-11 13:30:08 +00:00
lbsa71 9414d6a1e1 * miniscule changes just to keep myself in synch 2007-12-07 13:49:33 +00:00
lbsa71 064404ab40 * Moved OpenSim/Framework/General to OpenSim/Framework for great justice. 2007-10-31 07:28:23 +00:00