aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* * Reverted the AssetServer fix, apparently something was dependent on ↵lbsa712009-02-199-180/+230
| | | | IAssetDataPlugin being in OpenSim.Data
* * Moved the AssetStreamHandlers to OpenSim.Framework.Serverslbsa712009-02-193-4/+0
| | | | | | | | * And there, all refs to OpenSim.Grid.AssetServer.exe gone. /me takes a bow.
* * moved the Get/PostAssetStreamHandler to the Servers namespace... slowly ↵lbsa712009-02-193-3/+2
| | | | getting there...
* * Split RestService.cs into GetAssetStreamHandler.cs and ↵lbsa712009-02-192-155/+138
| | | | | | | PostAssetStreamHandler.cs - then killed off original (misnomed) file. * Really, who wrote this jurassic shit code all with totally wrong file names? Ah yeah, that'd be me. Sorry.
* * Changed Prebuild.xml back to specifying xmlnslbsa712009-02-191-56/+1
| | | | | * Consequentially, dropped Prebuild solution from Prebuild.xml as the 1.7 schema does not allow for more than one solution per xml file. (*rolls eyes*)
* * Extracted IAssetData and moved it to OpenSim.Framework to prepare to get ↵lbsa712009-02-197-14/+41
| | | | | | | rid of ugly CoreModules dependency on AssetServer.exe * And yes, the IAssetDataPlugin is misnomed, which became apparent on extracting it.
* * Apply http://opensimulator.org/mantis/view.php?id=3151Justin Clarke Casey2009-02-1912-28/+37
| | | | | | | * Fixes NHibernate overflow exception when saving some objects (under at least PostgreSQL 8.3) * Thanks Tommil!
* * It think it actually works now. Only that AssetService weirdness left to fix.lbsa712009-02-191-0/+0
| | | | | * Ignored some gens
* * Apply http://opensimulator.org/mantis/view.php?id=3142Justin Clarke Casey2009-02-1930-180/+1125
| | | | | | | | | * Changes varchar(36) columns to UUID type in MSSQL - this will be much more efficient * ===As always, please, please backup your database before applying this patch=== * Thanks Ruud Lathrop (for the patch) and StrawberryFride (for the review)
* * Okay, so finally got my head around this. Problem is that upstream ↵lbsa712009-02-1961-2148/+2961
| | | | | | | | | | | | | Prebuild copied dlls promiscuously, and this led to the references being all mixed up (/bin dlls overwritten by different versions on every csc) * Something that thus needs fixing is the fact that ProjectReferences has to be marked <ProjectReference> <Private>False</Private> </ProjectReference> but that is not configurable in the upstream Xml Schema. I've hardcoded it in our repo for now.
* * Fix http://opensimulator.org/mantis/view.php?id=3193Justin Clarke Casey2009-02-191-51/+45
| | | | | | * Make it possible once again to set a console log level threshold in OpenSim.exe.config
* * refactor: Rename new class AssetGatherer to UuidGatherer to reflect what ↵Justin Clarke Casey2009-02-193-7/+7
| | | | it actually does
* * Do deep inspection when saving inventory items in order to capture all the ↵Justin Clarke Casey2009-02-191-1/+1
| | | | | | | | | necessary assets (textures, objects within objects, textures referenced in scripts contained in objects contained in another object, etc.) * Not yet ready for general use
* * reverted the revert of the revert. What can I say? I'm calling this a day, ↵lbsa712009-02-1961-2821/+2011
| | | | and will get back up on the horse tomorrow.
* * Changed all AssemblyInfo to explicit version 1.0.0.0 to not confuse poor ↵lbsa712009-02-1923-31/+31
| | | | poor Nant. We probably should take the opportunity to let the non-module bins reside in their /bin/Debug dirs later.
* * Reverted the revert, as it seems the problem was the 1.0.* in the separate ↵lbsa712009-02-1961-2011/+2821
| | | | projects.
* * Reverted Prebuild commit due to strange run-time errors.lbsa712009-02-1961-2821/+2011
|
* * Ignored some binslbsa712009-02-190-0/+0
|
* * ... okay, so the Prebuild.exe changed again when building from VS... ↵lbsa712009-02-191-0/+0
| | | | trying to get to the bottom of this.
* Make the implementation of the message transfer module protected virtualMelanie Thielker2009-02-191-13/+13
| | | | | | throughout
* * Hm. Something odd here, the Prebuild.exe wasn't supposed to change from ↵lbsa712009-02-191-0/+0
| | | | | | | | last commit. Re-trying. * Ignoring some gens
* === PREBUILD UPSTREAMS UPDATE : POTENTIAL BREAKAGE ===lbsa712009-02-1961-2011/+2821
| | | | | | | | | | | | | | | | | | | | | | | * Applied upstreams changes to allow for auditing and debugging in our various environments. * This should, in theory, bring back 'multiple ref dirs'. * Temporarily Removed xmlns because prebuild-1.7 schema does not allow for multiple solutions per prebuild node (This will be a moot issue once the Prebuild node is moved out of prebuild.xml) * Autotools target: Various minor fixes * MonoDevelop Target : No changes. * Nant Target: Various minor fixes, support for net-3.5 and mono-2.0/3.5 targets * Sharpdevelop targets: No changes. * VS Targets: Refactored into using VSGenericTarget, and supports 2.0-3.5 * XCode Target: No changes. --- Regressions and outstanding issues --- * The Solution is assigned a random Guid - will lead to unnecessary reloads and loss of user settings. --- New features of Prebuild 2.0.4 --- * (Better) support for Web, WinForms and Database Projects and build actions * Conditional Framework Version compilation support (1.1, 2.0-3.5) * ArrayList -> List<>, ICollection -> IList (this means Prebuild can generate 1.1 solutions, but can't itself be built under 1.1 - how very meta) * Added <?include file="sub_prebuild.xml" ?> preprocessor directive.
* reverted last revision, until we decide how to handle capturing IM'sMW2009-02-192-18/+1
|
* Added a event to IMessageTransferModule (and MessageTransferModule) so that ↵MW2009-02-192-0/+17
| | | | other modules can capture IM messages and do custom handling of them. As just attaching to Client IM events doesn't really support this, as they would still get routed through the normal process and could give back errors.
* Force plugin state update when region crossingMelanie Thielker2009-02-191-0/+4
|
* Try this, then :) remove just one line from script serialization, Melanie Thielker2009-02-191-1/+0
| | | | | | hunting the bug
* Refix the fix, adding a forgotten lineMelanie Thielker2009-02-191-0/+1
|
* Attempt to fix a Windows only race in thread terminationMelanie Thielker2009-02-191-1/+8
|
* Thank you, Snowdrop, for a patch that makes the callback ID parameterMelanie Thielker2009-02-198-16/+18
| | | | | | | | usable. Applied with formatting changes, please don't introduce K&R style indentations into OpenSim Fixes Mantis #3190
* Mantis#3188. Thank you kindly, BlueWall, for a patch that:Charles Krinke2009-02-192-3/+50
| | | | | Adding the ability to set the background color for osSetDynamicTextureData in the extra data: bgcolour:value (see http://msdn.microsoft.com/en-us/library/aa358802.aspx [^] for color names)
* Fix region crossing for unscripted prims, avoid costly SEHMelanie Thielker2009-02-191-1/+3
|
* Make in-code provisions for the tests. Tests would fail because the Melanie Thielker2009-02-181-1/+14
| | | | | | | | required file system objects are not present in the test harness. This makes the main code ignore the failure, therefore the test succeeds. Not elegant and maybe a unit test guru has a better way. Marked as a TODO
* Fix standalone / simulator local script crossings.Melanie Thielker2009-02-181-0/+2
|
* Fix the windows sharing violations on script crossingsMelanie Thielker2009-02-183-16/+91
|
* Stops animations on Teleports, to conform with what the viewer does.diva2009-02-183-0/+11
|
* * Change AssetGatherer method access so that only methods which are worth ↵Justin Clarke Casey2009-02-183-88/+101
| | | | calling from the outside are public
* Fixes height on Basic Physics in local teleports. Plus some small refactoring.diva2009-02-182-2/+18
|
* * minor: comment out a few more [de]serialization sog timing messagesJustin Clarke Casey2009-02-181-3/+3
|
* * Move asset gathering code from oar module to OpenSim.Region.Framework ↵Justin Clarke Casey2009-02-183-198/+264
| | | | | | | | since this is useful in a variety of situations * Comment out one oar test since I think somehow the two save tests are causing the occasional test failures
* * Make save iar behave properly if the nominated inventory path does not existJustin Clarke Casey2009-02-182-10/+28
| | | | | | * load iar probably still fails for this
* Fix estate ban list persistence in MySQL and reenable testsMelanie Thielker2009-02-182-16/+1
|
* Restoring method 2 of linking regions in HG, which was commented out for ↵diva2009-02-181-92/+22
| | | | some bizarre reason. Fixes mantis #3141. Thanks Vinc for providing an alternative patch, which wasn't used but served to expose the mix-up.
* From: Alan Webb <awebb@linux.vnet.ibm.com>Sean Dague2009-02-184-32/+48
| | | | | | | I've changed the extension point name, and the internal references that used the same string. I also fixed up the messaging around the asset loader so that it is more explicit.
* From: Christopher Yeoh <yeohc@au1.ibm.com>Sean Dague2009-02-187-0/+62
| | | | | | | | | | | | | | The attached patch implements osGetDrawStringSize that looks like: vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize) in LSL. It is meant to be used in conjunction with the osDraw* functions. It returns accurate information on the size that a given string will be rendered given the specified font and font size. This allows for nicely formatted and positioned text on the generated image.
* remove legacy pre-migration code for mysql grid adapter, who knew thisSean Dague2009-02-181-55/+0
| | | | | was still in there.
* Improved log message.diva2009-02-181-2/+2
|
* Adds support for preserving animations on region crossings and TPs. diva2009-02-188-46/+699
| | | | | | | Known issue: after TP, the self client doesn't see the animations going, but others can see them. So there's a bug there (TPs only, crossings seem to be all fine). Untested: did not test animation overriders; only tested playing animations from the viewer.
* Makes SP.CopyFrom a bit more robust with respect to sims in older versions ↵diva2009-02-171-6/+4
| | | | which still don't have the new appearance management code.
* Fix a typo. i + i is not 2 times meMelanie Thielker2009-02-171-1/+1
|
* Re-fixing the fix :/Melanie Thielker2009-02-171-1/+1
|