aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Prevent object loss and positioning outside the region with failed object simMelanie2012-02-143-8/+18
| | | | crossings
* Merge branch 'master' into careminsterMelanie2012-02-104-12/+44
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-101-9/+20
| |\
| | * Fix an npc delete race condition with LSL sensors where an initial presence ↵Justin Clark-Casey (justincc)2012-02-101-9/+20
| | | | | | | | | | | | | | | | | | | | | check could succeed but then the npc removed before the subequent npc check. The resulting null would cause an exception. We now check for null before looking at SenseAsAgent. Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872
| * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-02-102-3/+12
| |\ \ | | |/
| | * Fix bug where somebody taking a copy of an object they didn't own that was ↵Justin Clark-Casey (justincc)2012-02-102-3/+12
| | | | | | | | | | | | | | | | | | rezzed before the region was restarted would wrongly place the copy in the object owner's inventory. Addresses http://opensimulator.org/mantis/view.php?id=5825
| * | Fix: Covenant view fails after updates or cache-clean see mantis ↵PixelTomsen2012-02-101-0/+12
| |/ | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2879 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-02-1010-19/+54
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * Fix: Unable to remove AV from friend list (sqldb-bug) ↵PixelTomsen2012-02-101-7/+7
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3731
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-106-11/+40
| | | | | | | | | | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
| * If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵Justin Clark-Casey (justincc)2012-02-092-9/+8
| | | | | | | | should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
* | Merge branch 'master' into careminsterMelanie2012-02-097-14/+69
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-092-1/+10
| |
| * Stop a scene object from attempting to link with itself (which results in an ↵Justin Clark-Casey (justincc)2012-02-084-10/+54
| | | | | | | | | | | | exception and constant complaints in v3 viewers). Aims to address http://opensimulator.org/mantis/view.php?id=5878
| * Make WebStats logging report consistently as WEB STATS MODULE instead of VC, ↵Justin Clark-Casey (justincc)2012-02-071-6/+5
| | | | | | | | VS and WEBSTATS
* | Push more NPC stuff into threadsMelanie2012-02-082-23/+40
| |
* | Merge branch 'master' into careminsterMelanie2012-02-071-1/+2
|\ \ | |/
| * Add start GC memory and end GC memory to object stress test printouts.Justin Clark-Casey (justincc)2012-02-071-1/+2
| | | | | | | | | | This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general). This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-078-39/+145
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-078-39/+145
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-071-1/+25
| | |
| | * Remove debug logging if physics actor is null in SOP.ApplyPhysics()Justin Clark-Casey (justincc)2012-02-071-5/+1
| | | | | | | | | | | | This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
| | * Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)2012-02-076-34/+117
| | | | | | | | | | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
* | | Experimental. Expand Fire & Forget for NPC deleteMelanie2012-02-061-7/+7
|/ /
* | Merge branch 'master' into careminsterMelanie2012-02-054-8/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Revert my two quick fixes for the lag issue and put in the real fix, whichMelanie2012-02-051-1/+2
| | | | | | | | | | is to only write to the database if data was changed. I was writing to the db on every step of every avatar. Sure to give us lag, that.
| * Revert "Remove checks on ban list expiry on every move. To be re-added on ↵Melanie2012-02-051-4/+4
| | | | | | | | | | | | parcel" This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56.
| * Revert "Check ban list for a particular parcel only when an avatar moves ↵Melanie2012-02-052-17/+4
| | | | | | | | | | | | into it." This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461.
| * Make configuration uniformBlueWall2012-02-051-3/+3
| | | | | | | | Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
| * Check ban list for a particular parcel only when an avatar moves into it.Melanie2012-02-052-4/+17
| | | | | | | | | | This restores functionality remove in the last commit without reintroducing the performance penalty.
| * Remove checks on ban list expiry on every move. To be re-added on parcelMelanie2012-02-051-4/+4
| | | | | | | | | | boundary crossing only as soon as I'm properly awake. This should fix recent performance issues
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| | | | | | | | variable in OpenSim.ini and Regions.ini match
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-02-0414-131/+106
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would ↵Justin Clark-Casey (justincc)2012-02-041-0/+2
| | | | | | | | eventually be used by llCastRay(), though OpenSim does not use these yet.
| * Correct RC_* LSL constants used by llCastRay().Justin Clark-Casey (justincc)2012-02-041-12/+12
| | | | | | | | Many thanks to WhiteStar for doing the research on this.
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵Justin Clark-Casey (justincc)2012-02-043-22/+21
| | | | | | | | | | | | | | | | if we have been passed a non-zero transaction ID. This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-038-22/+23
| |\
| | * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-046-28/+31
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-034-6/+8
| | | |\
| | | | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-034-6/+8
| | | | |\
| | | | | * Fix: Covenant changed time not set ↵PixelTomsen2012-02-034-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-032-16/+18
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | | * | | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵Dan Lake2012-02-031-4/+7
| | | | |/ | | | |/| | | | | | | | | | | triggering events on a potentially null Scene
| | * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵Snoopy Pfeffer2012-02-033-8/+8
| | | | | | | | | | | | | | | | | | | | corresponding RemoteAdmin parameter
| * | | | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-74/+29
| | |_|/ | |/| | | | | | | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.
| * | | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ↵Justin Clark-Casey (justincc)2012-02-031-14/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | presence and population of m_avatars. This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated. Extending the lock is the easiest to understand solution rather than getting complicated with null checks. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
| * | Corrected console help texts for "save iar"Snoopy Pfeffer2012-02-031-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-034-41/+98
|\ \ \ | |/ /
| * | Commenting out new event until I can fix OpenSim tests. Currently, testing ↵Dan Lake2012-02-021-6/+6
| | | | | | | | | | | | objects does not create a Scene or EventManager so triggering events crashes some tests
generated by cgit v1.1 at 2024-12-17 05:05:06 +0000