aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* On the later forms of teleport failure, tell the user if this was because ↵Justin Clark-Casey (justincc)2013-03-201-2/+8
| | | | | | | viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion. Also adds regression test for the case where the viewer couldn't connect with the destination region. Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
* Prevent multiple instances of the same item ID being appended to an ↵Justin Clark-Casey (justincc)2013-03-192-4/+12
| | | | | | | | AvatarAppearance It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID). However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there. This commit requires both simulator and service to be updated.
* Process default attachment point in AttachObjectInternal before we check ↵Justin Clark-Casey (justincc)2013-03-191-27/+27
| | | | whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
* Fix tests for multiattachMelanie2013-03-182-6/+6
|
* Merge branch 'master' into newmultiattachMelanie2013-03-182-82/+305
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| | | | | | | | This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
| * Fix recent regression where an item worn to an attachment point that was ↵Justin Clark-Casey (justincc)2013-03-182-89/+153
| | | | | | | | | | | | | | already occupied did not remove the previous attachment (current behaviour) Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013) Added regression test for this case.
| * minor: remove some completely unused string local vars added recently in ↵Justin Clark-Casey (justincc)2013-03-061-2/+0
| | | | | | | | commit 984faf2
* | Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Get attachment script state before taking sp.AttachmentsSyncLock() to avoid ↵Justin Clark-Casey (justincc)2013-03-051-140/+161
| | | | | | | | | | | | race conditions between closing agents and scripts that may be doing attachment manipulation. This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
* | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| |
* | Multiattach, part 1Melanie2013-03-182-33/+31
|/ | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* Switched to using the other Util function with a default value.Diva Canto2013-02-271-1/+2
|
* Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-271-1/+1
| | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-221-1/+1
| | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-211-1/+1
|\
| * minor: Change summary in "show appearance" console command to "incomplete" ↵Justin Clark-Casey (justincc)2013-02-211-1/+1
| | | | | | | | | | | | | | rather than "corrupt" Corrupt is misleading - it implies textures were uploaded but are not j2k valid. The actual situation is that at least one required baked texture is not present.
* | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-211-1/+3
|/ | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
* Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
|
* Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| | | | | | | | Really "My Inventory" is just the name of the root, it isn't a folder in its own right. This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /* /* will still work and this is a special case just for the root If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/* Added a regression test for this case.
* Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-165-27/+179
|
* On IAR loading, if loading of a coaleseced item entirely fails, then ↵Justin Clark-Casey (justincc)2013-02-081-0/+18
| | | | continue with the IAR load rather than failing completely.
* Implement a workaround solution for saving manual script state changes by ↵Justin Clark-Casey (justincc)2013-01-111-5/+19
| | | | | | | the user before logout instead of wrongly removing the script early. This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen. This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
* Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-1/+17
| | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* On baked texture save, replace any HG ID with an ordinary asset ID so the ↵Justin Clark-Casey (justincc)2013-01-101-0/+3
| | | | HGAssetBroker doesn't try to save back to the avatar's originating region
* minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why ↵Justin Clark-Casey (justincc)2013-01-031-1/+4
| | | | we're deselecting the prim in code before scheduling an update on attachment
* Fix problem where object attached from ground often does not get attached ↵Justin Clark-Casey (justincc)2013-01-031-9/+1
| | | | | | | | properly. It seems this is happening because we send a kill for objects that are selected when attached. A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill. Aims to address http://opensimulator.org/mantis/view.php?id=6456
* If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-021-2/+8
| | | | that the operation failed
* Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-70/+68
| | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
* minor: also comment out the debug log message which reports searching for ↵Justin Clark-Casey (justincc)2012-12-041-2/+2
| | | | child agents in simulator scenes for now.
* minor: Comment out "Delivering IM to..." messages for now.Justin Clark-Casey (justincc)2012-12-041-3/+3
|
* Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
|
* Bug fix in Offline IM for inventory transfers. The items were being placed ↵Diva Canto2012-11-271-11/+15
| | | | twice in the receiver's inventory.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-272-2/+2
|\
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-242-2/+2
| | | | | | | | automatically turns off any logging enabled between tests
* | Prevent the core Groups module from being enabled when its name doesn't ↵Diva Canto2012-11-271-0/+3
|/ | | | match the "default" ini choice
* Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-172-5/+4
| | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
* Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-1310-0/+19
|
* Disable code to get server-side to move given items to a destination folder ↵Justin Clark-Casey (justincc)2012-11-131-67/+70
| | | | | | | | | on TaskInventoryAccepted. This is because the fixes to inventory versioning (so that they better match viewer expections) now appear to allow the viewer to execute #RLV moves, as happens on the LL grid. Doing it again server-side now wrongly creates another child #RLV folder underneath the root one. As per http://opensimulator.org/mantis/view.php?id=6311
* Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-1210-10/+10
|
* Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-123-3/+3
| | | | grepping for remaining uses
* One more module converted: InventoryArchiverModule.Diva Canto2012-11-111-8/+31
|
* One more module converted: GroupsModule.Diva Canto2012-11-101-7/+43
|
* One more module converted: GodsModule.Diva Canto2012-11-101-19/+49
|
* One more module converted: GesturesModule.Diva Canto2012-11-101-6/+27
|
* One more module converted: Combat/CombatModule.Diva Canto2012-11-101-4/+25
|
* One more module converted: AvatarFactoryModule.Diva Canto2012-11-101-6/+31
|
* formatting DialogModule for 80-character width terminalSignpostMarv2012-11-101-47/+73
|
* Converting DialogModule to INonSharedRegionModuleSignpostMarv2012-11-101-5/+23
|
* To keep things consistent allowing an UnregisterModuleInterface... Force ↵teravus2012-11-061-5/+13
| | | | the GodModule to request the dialog module interface on a kickuser call and not to use the 'in memory cached one'. Thanks Ar3s for locating the offending inconsistency.
generated by cgit v1.1 at 2024-12-20 04:05:11 +0000