aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'master' into careminsterMelanie2012-04-138-109/+178
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Mantis 55025 Implement script time.Talun2012-04-127-46/+135
| | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| * | | make changes to FlotsamCache.ini.example as noted in mantis #5960nebadon2012-04-121-2/+2
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5960
* | | | Merge branch 'master' into careminsterMelanie2012-04-1113-25/+171
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * | | HGFriendsModule: Type casts to fix compile errorSnoopy Pfeffer2012-04-111-1/+1
| | | |
| * | | HGFriendsModule: Added optional user level based restriction to send ↵Snoopy Pfeffer2012-04-113-4/+28
| | | | | | | | | | | | | | | | friendship invitations to foreign users.
| * | | HGFriendsModule: add the scaffolding for supporting permissions pertaining ↵Diva Canto2012-04-112-2/+32
| | | | | | | | | | | | | | | | to HG friendships. Snoopy take it from here.
| * | | New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as ↵Snoopy Pfeffer2012-04-105-2/+84
| | |/ | |/| | | | | | | originally proposed in SL Jira (https://jira.secondlife.com/browse/SVC-244).
| * | Add uri to various log messages when region registration fails. Upgrade ↵Justin Clark-Casey (justincc)2012-04-101-8/+15
| | | | | | | | | | | | some debug log messages to error.
| * | minor: convert tabs to spaces in config example files from recent 7c534e5Justin Clark-Casey (justincc)2012-04-102-12/+12
| | |
| * | Correct max_listeners_per_region in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | max_listens_per_region Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect Thanks to Ovi Chris Rouly for pointing this out.
| * | Do not timeout group member cache entry, as long as there are frequent group ↵Snoopy Pfeffer2012-04-101-0/+3
| | | | | | | | | | | | membership requests. These are caused by movements within the parcel boundaries.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-091-10/+2
|\ \ \ | | |/ | |/| | | | careminster
| * | Fix a LSL merge artefactMelanie2012-04-081-10/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-097-21/+159
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Mantis5502 implementation of some of the new constantsTalun2012-04-096-20/+155
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | Addresses mantis #5846Diva Canto2012-04-081-1/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-083-50/+72
|\ \ \ | |/ / | | / | |/ |/|
| * A few more minor improvements on Suitcase inventory service.Diva Canto2012-04-071-7/+6
| |
| * Added gatekeeper and uas addresses to grid info, so that viewers can take ↵Diva Canto2012-04-072-0/+16
| | | | | | | | advantage of that info.
| * Better Suitcase Inventory Service.Diva Canto2012-04-061-48/+55
| |
* | Merge branch 'master' into careminsterMelanie2012-04-0727-373/+960
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-0610-128/+268
| |\
| | * Rather than having a FromFolderID property on every single prim and only ↵Justin Clark-Casey (justincc)2012-04-074-10/+19
| | | | | | | | | | | | | | | | | | ever using the root prim one, store on SOG instead. This reduces pointless memory usage.
| | * Store FromItemID for attachments once on SOG instead of on every SOP and ↵Justin Clark-Casey (justincc)2012-04-078-34/+29
| | | | | | | | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use.
| | * refactor: Eliminate unnecessary SOP.m_physActorJustin Clark-Casey (justincc)2012-04-061-10/+1
| | |
| | * Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL ↵Justin Clark-Casey (justincc)2012-04-061-0/+1
| | | | | | | | | | | | | | | | | | functions. This is the same as PRIM_POSITION
| | * refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()Justin Clark-Casey (justincc)2012-04-061-4/+4
| | |
| | * Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene ↵Justin Clark-Casey (justincc)2012-04-062-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | or attachments. Return relative position to root prim rather than 0,0,0. Should fix same issue with llGetLocalPos() http://opensimulator.org/mantis/view.php?id=5951
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-062-0/+82
| | |\
| | | * Addition of missing constants for llGetObjectDetails including for Mantis 5502Talun2012-04-062-0/+82
| | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| | * | For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-062-3/+40
| | |/ | | | | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass This is the mass as used by the physics engine (ODE or Bullet).
| | * Make llGetMass() return total mass of object when called on root prim.Justin Clark-Casey (justincc)2012-04-061-1/+4
| | | | | | | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-0626-205/+684
| | |\
| | * | remove possible PhysActor unexpectedly null race conditions when changing ↵Justin Clark-Casey (justincc)2012-04-032-63/+74
| | | | | | | | | | | | | | | | | | | | | | | | prim collision status factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
| * | | Moved the inventory manipulation from HGEntityTransferModule to ↵Diva Canto2012-04-064-150/+208
| | |/ | |/| | | | | | | HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
| * | Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-062-835/+1
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-062-3/+49
| |\ \
| | * | Added missing refresh of group membership client side cache to the groups ↵Snoopy Pfeffer2012-04-051-1/+2
| | | | | | | | | | | | | | | | module. Before memberships of non active groups often were not stored in the cache (n_groupPowers).
| | * | Revert last commitSnoopy Pfeffer2012-04-051-22/+25
| | | |
| | * | Group based access restrictions to parcels require group membership, but not ↵Snoopy Pfeffer2012-04-051-25/+22
| | | | | | | | | | | | | | | | that this group is active for that user.
| | * | Little bug fix in HasGroupAccess, to properly store the case "true" in the ↵Snoopy Pfeffer2012-04-051-5/+2
| | | | | | | | | | | | | | | | cache.
| * | | If an AddItem fails, try adding it to the right folder type.Diva Canto2012-04-061-20/+63
| | | |
| * | | WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on ↵Diva Canto2012-04-062-57/+1007
| | | | | | | | | | | | | | | | purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
| * | | A few minor tweaks here and there in XInventoryService.Diva Canto2012-04-061-14/+48
| | | |
| * | | Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-066-33/+201
| | | |
| * | | Packing of folder in SendBulkUpdateInventory always set the folder type to ↵Diva Canto2012-04-061-1/+2
| | | | | | | | | | | | | | | | -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
| * | | Guard against null inventory contents.Diva Canto2012-04-061-2/+2
| | | |
| * | | Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
| | | |
* | | | Merge branch 'ubitwork'Melanie2012-04-046-145/+462
|\ \ \ \
generated by cgit v1.1 at 2024-10-26 12:31:17 +0000