aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* make distribution creating code to copy FlotsamCache.ini.example to ↵Justin Clark-Casey (justincc)2011-09-241-0/+1
| | | | FlotsamCache.ini
* remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
|
* Correct asset id of library default iris texture.Justin Clark-Casey (justincc)2011-09-231-1/+1
| | | | For this change to show up you will need to clear viewer cache.
* Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-238-93/+270
| | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-221-5/+5
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-2112-90/+28
| |\
| * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
| | |
* | | Fix failure to teleport when an agent is lured on the same sim (and probably ↵Justin Clark-Casey (justincc)2011-09-222-9/+18
| |/ |/| | | | | | | | | | | | | | | in neighbouring sims) with HG lure active It turns out that the HG lure module was setting up a pending lure when it intercepted the instant message on its way out to the target avatar. However, an IM would only be sent if the user was remote, so it would not be set up for users on the same sim or in an immediate neighbour. We fix this by adding the pending lure when the message goes out and ignoring a duplicate pending lure add if it goes to out via IM. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5690
* | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-2212-90/+28
|/ | | | This is moved into ScenePresence for now as a general facility
* Move code which handles NPC movement into Scene so that this can also be ↵Justin Clark-Casey (justincc)2011-09-213-1/+203
| | | | | | | | used by Autopilot coming from the client side. I thought that I had implemented this but must have accidentally removed it. Adds a regression test to detect if this happens again. Temporarily disables automatic landing of NPC at a target. Will be fixed presently.
* Remove unused and never set SP.PreviousRotationJustin Clark-Casey (justincc)2011-09-211-8/+0
|
* get rid of an incredibly noisy logging message from the last commitJustin Clark-Casey (justincc)2011-09-211-1/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-212-12/+18
|\
| * Null simulation data must return a non-null region settings or other parts ↵Dan Lake2011-09-201-2/+4
| | | | | | | | of the simulator expect
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-203-66/+0
| |\
| * | Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
| | |
* | | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-213-6/+115
| |/ |/| | | | | | | | | | | This stops the npc walking backwards if the target is directly behind. This means that the npc no longer returns to its original rotation once movement has finished. If you want this behaviour, please store and reset the original rotation after movement. This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678
* | Remove vestigal OpenSim.Data mono addins extension points that don't look ↵Justin Clark-Casey (justincc)2011-09-203-66/+0
|/ | | | like they've been active for at least 2 and a half years
* adjust some whitespace to trigger another build, to check the last failure ↵Justin Clark-Casey (justincc)2011-09-171-2/+2
| | | | was just a glitch
* Add BulletSim physics option details to OpenSim.ini.example. Marked as in ↵Justin Clark-Casey (justincc)2011-09-171-0/+2
| | | | development and experimental.
* Remove old bullet DotNET and X libraries in preparation for BulletSJustin Clark-Casey (justincc)2011-09-1711-7087/+1
| | | | | These weren't working properly anyway. You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
* Add back BulletSPlugin.dll.config that I somehow managed to delete today in ↵Justin Clark-Casey (justincc)2011-09-171-0/+6
| | | | a00327d
* On setting a new avatar appearance, if height hasn't changed then don't set ↵Justin Clark-Casey (justincc)2011-09-172-1/+7
| | | | | | that same height in ScenePresence. This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself
* Revert "uncomment Standalone config in OpenSim.ini.example."Justin Clark-Casey (justincc)2011-09-171-1/+1
| | | | | | | This reverts commit 44a491f36bbe2094634e356591381c90f87e2125. This makes packaging OpenSim slightly easier but then generates a FriendsConnector error if naively used after compilation. So let's revert to stick with the "DataStore" error for now - at least that's a known error.
* Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-162-6/+23
| | | | | | When upgrading the previously child agent to a root, the code was setting the Size parameter on the ODECharacter PhysicsActor. This in turn reset Velocity, which cause the border stall. I'm fixing this by commenting out the Velocity = Vector3.Zero lines since they don't appear to play a useful purpose
* minor: I was wrong about OffsetPosition - sometimes it genuinely does return ↵Justin Clark-Casey (justincc)2011-09-161-0/+4
| | | | | | offset position! Add method doc to explain this.
* Remove setter from SP.OffsetPosition, since all sets should flow through ↵Justin Clark-Casey (justincc)2011-09-162-5/+23
| | | | | | SP.AbsolutePosition OffsetPosition is also misnamed - it returns the absolute position and never contains an offset.
* Fix base_hair.dat to actually contain the base hair asset rather than base ↵Justin Clark-Casey (justincc)2011-09-161-6/+94
| | | | | | | | 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!
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-163-7/+3
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2011-09-161-1/+4
| |\
| * | Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-163-7/+3
| | |
* | | Updated some variables to be closer to the coding standards (and easier to ↵Kevin Houlihan2011-09-161-91/+88
| |/ |/| | | | | | | | | | | understand). There were a few variables in LocalConsole with single character names, and the class fields did not use the m_ prefix. I also removed a redundant variable, h. It was being set to 1 in a couple of places, and incremented in another, but never actually used.
* | Passwords could be revealed in console by pressing backspace.Kevin Houlihan2011-09-161-1/+4
|/ | | | Pressing backspace causes hidden input (such as passwords) to be revealed on the console. The echo state was not being taken into account when handling a backspace key press.
* MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore ↵Chris Hart2011-09-163-7/+71
| | | | and InventoryStore
* Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-168-146/+267
| | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-162-4/+14
|
* On standalone, by default create the necessary minimum body parts and ↵Justin Clark-Casey (justincc)2011-09-163-2/+21
| | | | | | | clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini This is left as false in grid mode
* refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-162-45/+52
|
* Correctly create a freshly created estate owner's default items and avatar ↵Justin Clark-Casey (justincc)2011-09-165-94/+70
| | | | entries on standalone if applicable.
* Write code to create minimum necessary body parts/clothing and avatar ↵Justin Clark-Casey (justincc)2011-09-1512-148/+362
| | | | | | | | | | | | 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.
* refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵Justin Clark-Casey (justincc)2011-09-158-43/+43
| | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client.
* Only bother to create an inventory xfer file if there are any items in a ↵Justin Clark-Casey (justincc)2011-09-151-2/+2
| | | | prim inventory
* Shuffle order of code in invnetory connector GetFolderContent() calls to ↵Justin Clark-Casey (justincc)2011-09-153-13/+19
| | | | avoid a possible race condition
* If a prim inventory becomes empty through deletion, send an empty xfer file ↵Justin Clark-Casey (justincc)2011-09-151-20/+43
| | | | | | | | | name rather than one that references a metadata file containing only the folder object. If we do this, then viewer 3 crashes when we try and rez a script directly in an attachment's prim inventory. Sending an empty file name was already being done if the prim's inventory had never been touched. Now we always do that if there are no items in that inventory. Hopefully addresses the remaining point in http://opensimulator.org/mantis/view.php?id=5644
* Don't try and delete attachments for child agent closeJustin Clark-Casey (justincc)2011-09-132-1/+34
|
* Remove code from DetachSingleAttachmentToInv() that sets group changed on ↵Justin Clark-Casey (justincc)2011-09-131-11/+0
| | | | all parts, now that we're performing this check in UpdateKnownItem() for other purposes
* remove redunant itemID and agentID arguments from UpdateKnownItem().Justin Clark-Casey (justincc)2011-09-131-6/+4
| | | | itemID is always taken taken from the group's stored item id, and agentID is never used.
* Remove UpdateKnownItem() from IAttachmentsModule.Justin Clark-Casey (justincc)2011-09-132-10/+1
| | | | It's not appropriate for code outside the attachments module to call this.
* minor: remove redundant grp != null check from AM.UpdateKnownItem()Justin Clark-Casey (justincc)2011-09-131-36/+33
|
* Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-134-44/+97
| | | | | | | | Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process. This change ignores those attempts. This stops script failures during login, as the rewearing was racing with the script startup code. It might also help with attachments being abnormally put into deleted state. Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644