aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Formatting cleanup.Jeff Ames2009-06-1061-121/+120
|
* Letting the Flotsam cache be enabled even when [AssetCache] section is ↵diva2009-06-091-8/+9
| | | | missing. Thank you mcortez!
* Formatting cleanup. Ignore some generated files.Jeff Ames2009-06-0911-263/+264
|
* Update svn properties.Jeff Ames2009-06-094-1538/+1538
|
* ARGH!!!! note to self: ALWAYS use String.IsNullOrEmpty(...)!Dr Scofield2009-06-091-1/+2
| | | | | | this patch fixes RemoteAdminPlugin gratuitously updating the user password even if no update was intended.
* Thank you Snoopy, for a patch that implements group permissions.Melanie Thielker2009-06-092-140/+264
| | | | | | | | Applied with changes: - removed spammy debug message - corrected tab formatting
* From: Alan Webb <alan_webb@us.ibm.com>Dr Scofield2009-06-095-42/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change addresses two issues: [1] It adds a flag field to the blendface call which allows the caller to indicate whether or not the generated asset is temporary, and whether or not the asset being replaced should be explicitly retired fromt the memory cache. The decimal values correspond to: 0 - Permanent asset, do not expire old asset 1 - Permanent asset, expire old asset 2 - Temporary asset, do not expire old asset 3 - Temporary asset, expire old asset '3' corresponds to the default behavior seen today, and is the continued behavior of the non-blendface calls. [2] The dynamic texture routines are highly-asynchronous and can be scheduled simultaneously on a multi-core machine. The nature of the texture management interfaece is such that updates may be lost, and the nature of asynchornous operation means that they may be processed out of order. A lock has been added to ensure that updates are at least atomic. No attempt has been made to enforce ordering. The lock applies to the SceneObjectPart being updated and is held for the lifetime of the TextureEntry used to carry texture updates (the one instance carries all faces supported by the prim). Users of these services should remember that the dynamic texture call is asynchronous and control will be returned *before* the texture update has actually occurred. As a result, a isubsequent GetTexture call may not return the expected asset id. A script must wait for the corresponding TEXTURE_CHANGED event before retrieving any texture information.
* Updating the flotsam asset cache. Thank you, mcortez!Melanie Thielker2009-06-081-438/+523
| | | | | | Fixes Mantis #3784
* Bug fix. Adding the asset to the cache after a DB get.diva2009-06-081-1/+5
|
* That didn't quite work. Trying this instead -- prompt given in the cmd line.diva2009-06-082-6/+10
|
* Making the prompt configurable in the server shell. Default is "Server".diva2009-06-081-2/+4
|
* IInentoryDataPlugins were missing.diva2009-06-081-2/+7
|
* First draft of the inventory service IN connector. Probably won't work yet. ↵diva2009-06-081-0/+276
| | | | But everything of inventory service is now checked in, first draft.
* Added more functions to IInventoryService. Unsure about whether all of these ↵diva2009-06-085-6/+185
| | | | are really necessary.
* First draft of inventory service connectors, and service implementation. No ↵diva2009-06-0710-470/+2712
| | | | | | | handlers yet, this is just the OUT part for now. It's not active and nothing in the simulator uses this yet. Just checking it in to start sharing with others. There are a couple of interesting software design points that could use other devs opinions. Hopefully I added all needed files.
* Skip lone ident statments or for-loop assignmentsMike Mazur2009-06-072-3/+65
| | | | | | | | | | | | | | | | | SL's LSL supports lone idents: integer x; x; as well as lone idents in for-loop assignments: for (x; x < 10; x++) { ... } while those are errors in C# (MONO at least). This patch skips lone idents in such places. Fixes Mantis #3042.
* Allow empty assignment in for-loopMike Mazur2009-06-075-7513/+7733
| | | | | | | | | | | | For loops with no assignment are no longer syntax errors. For example, this is now valid: for ( ; i < 10; i++) { ... } Corresponding changes to lsl.{lexer,parser} in r99 in opensim-libs. Fixes Mantis #2501. Fixes Mantis #2884.
* * Reverting the test restructuring as, on second thought, this is not at all ↵lbsa712009-06-075-0/+0
| | | | | | | how the tests are structured. (pt1)
* Rename private TestllAngleBetween methodMike Mazur2009-06-071-13/+13
| | | | | | | | It seems overloading the method TestllAngleBetween confused nunit a bit and caused it to try running the private TestllAngleBetween method. The method's access modified prevented that from happening, and nunit complained.
* Correct an error where the config file name was always considered to be aMelanie Thielker2009-06-065-7/+18
| | | | | | | local file. This caused llHttpRequest and llSetInventoryPermsMask to fail on regions that load their config from a web server
* some code cleanupDahlia Trimble2009-06-061-3/+0
| | | | | | test commit with cygwin svn
* * minor: tiny tweak just to trigger another panda buildJustin Clarke Casey2009-06-051-1/+1
|
* * A bug fix for the last mantis 3741 bugfixJustin Clarke Casey2009-06-051-10/+7
| | | | | | * Hopefully now, the nre should not occur and the lock should be correctly unlocked during the initial save oar process
* * A further fix for mantis 3641 (oar saves do not complete)Justin Clarke Casey2009-06-051-12/+15
| | | | | | | | * For some reason, if a null was recieved (indicating a missing asset), the code had stopped passing that on to the waiting lock, resulting in a perpetual freeze * This change passes the null on correctly * Many thanks to thomax for being insistent in presenting his analysis of the problem :)
* * refactor: split out part xml writing in SceneObjectSerializerJustin Clarke Casey2009-06-051-2/+7
|
* * Fix unit tests so that they correctly handle 404 missing asset responseJustin Clarke Casey2009-06-053-9/+14
| | | | | | * I didn't think there were tests in this area - my bad
* * Fix problem where known missing assets would stop save oar ever completingJustin Clarke Casey2009-06-053-14/+58
| | | | | | | | | * Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response * So make asset service return http status NOT FOUND rather than OK in accordance with REST * and interpret this correctly in the async response so that a null object is sent back * This means that this fix won't be active until both region simulator and server reach this revision
* * Add oar saving timeoutJustin Clarke Casey2009-06-055-4/+138
| | | | | | | | | * If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds * Timeout executes abort, since missing assets in an OAR seems bad * This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service * This is not a solution to mantis 3714. Hopefully a fix will be along shortly since I can now consistently reproduce that problem
* Thank you, thomax, for a patch to provide finer-grained access control toMelanie Thielker2009-06-056-4/+102
| | | | | | | scripting. Fixes Mantis #2862
* * Restructured Scenes Tests to follow (what I conceive of as being) current ↵lbsa712009-06-055-0/+0
| | | | directory standards. (pt 1 - thank you, svn. not.)
* Committing mcortez's FlotsamAssetCache after several positive reviews.Melanie Thielker2009-06-051-0/+438
| | | | | | Thank you, mcortez!
* Changed a comment to reflect changes in config.diva2009-06-041-1/+1
|
* Comment out unused variables / private fields to avoid compiler warnings.Jeff Ames2009-06-048-40/+31
|
* Comment out unused private functions to avoid compiler warnings.Jeff Ames2009-06-043-70/+70
|
* Fix comparison of UUID with null.Jeff Ames2009-06-041-1/+1
|
* Add copyright headers.Jeff Ames2009-06-0412-26/+322
|
* Update svn properties.Jeff Ames2009-06-045-3519/+3519
|
* Committing the skeleton of the authentication serviceMelanie Thielker2009-06-031-0/+74
|
* Make AssetMetadata [Serializable] to help in binary cachingMelanie Thielker2009-06-031-0/+1
|
* Committing the partial refactor of authentication services. No user functionlityMelanie Thielker2009-06-033-5/+85
| | | | | | will eat your babies, etc
* * Making sure we fail a bit earlier if we have no AssetServicelbsa712009-06-031-0/+7
|
* From: Chris Yeoh <yeohc@au1.ibm.com>Dr Scofield2009-06-038-2/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds oar file date and time (UTC) meta data to an oar file when it is created. It also adds a unique ID, though this id does not in anyway identify the machine that the oar file was created on. When an oar file with this meta data is loaded this extra information is saved with the region settings and available via LSL through: - osLoadedCreationDate() - osLoadedCreationTime() - osLoadedCreationID() If there is no meta data these fields will be blank. Subsequent oar file loads will erase the information for the previous oar file load. Persistence has only been implemented for MySQL, the other backends need updating. Overall this allows us to much more easily identify the specific version of software that clients are using. Its very straightforward to edit the oar file to change the ID string to be something more human friendly. Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql required for the MySQL DB migration. btw I had a chat with justincc about this a few weeks ago since he wrote the oar file import/export and he sounded happy to accept something that included date/time information but didn't want anything that would silently leak private information like machine names.
* From: Chris Yeoh <yeohc@au1.ibm.com>Dr Scofield2009-06-031-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixes wild swings in memory usage related to usage of GetDrawStringSize() We've been seeing wild swings in memory usage and a large chunk of memory leak. From analysing this it's pretty clear that the mono garbage collector is rather buggy! When exercised heavily it looks like it frees more than its meant to resulting in crashes. GetDrawStringSize() measures the size in pixels of text. To do this memory for an image is allocated and used to call the GDI text measure functions. Although no reference to the temporary memory for the measuring is kept, it takes quite a while for the mono garbage collector to clean up - so if lots calls to GetDrawStringSize() are made at once there can be a spike in memory usage. If the garbage collector is not fast enough then the GDI layer runs out of memory. It also looks like the garbage collector is not always reclaiming all of the memory. I've attached an OpenSim patch which works around the garbage collector issues. Instead of dynamically allocating memory for measuring text sizes, it serialises (on a per region basis) access to a single block of memory. The effect of this is to be nicer to the garbage collector as it has a lot less work to do, at the cost of some theoretical loss in performance (nothing noticeable with our tests which hit it pretty hard). OpenSim still does leak memory slowly, but it is a lot more stable with this patch. I suspect that either the garbage collector misses bits of freed memory or the GDI/cairo layer leaks a bit each time a texture is created. Thats going to be a lot harder to hunt down, but for reference if someone has OpenSim running on Windows it would be interesting to see if it has the same problem as it would tell us if its a mono/GDI problem or an OpenSim problem.
* From: Alan Webb <alan_webb@us.ibm.com>Dr Scofield2009-06-031-2/+5
| | | | | | | | | | | Modify dynamic texture handling so that an explicitly targetted face is not scheduled for immediate expiration. The requirement for precaching explicitly requires these assets to persist. They do however remain temporary. This approach leaves the legacy mode of operation (ALL_SIDES) unchanged in this respect.
* Thank you Imaze Rhiano for a patch that implements Cenome Memory Asset Cache ↵Dahlia Trimble2009-06-036-0/+3520
| | | | | | | | (Mantis #3759) See the files: bin/config-include/GridCommon.ini.example and bin/config-include/StandaloneCommon.ini.example to configure and enable this caching method.
* Thanks aduffy70 for Mantis #3762: A patch to fix llGround, llGroundNormal, ↵Dahlia Trimble2009-06-031-42/+80
| | | | and llGroundSlope
* revert r9765 due to too many errors on some compilers. Affects Mantis #3759Dahlia Trimble2009-06-036-3519/+0
|
* add body to an empty getter/setterDahlia Trimble2009-06-031-1/+8
|
* fix a int[] declarationDahlia Trimble2009-06-031-1/+1
|
* Thank you Imaze Rhiano for a patch that implements Cenome Memory Asset Cache ↵Dahlia Trimble2009-06-026-0/+3512
| | | | | | | (Mantis #3759) See the files: bin/config-include/GridCommon.ini.example and bin/config-include/StandaloneCommon.ini.example to configure and enable this caching method.