aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add event RegionHeartbeatEnd for modules interested in coordinating activity ↵Dan Lake2012-02-012-10/+36
| | | | | | | | | | | | with region heartbeats
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-01122-1528/+5634
| |\ \
| * | | Trigger event when prims are scheduled for an update. This gives modules ↵Dan Lake2012-01-192-0/+28
| | | | | | | | | | | | | | | | early access to changed parameters.
| * | | Cleaned up Color and Text parameters in SOP and made LocalFlags public for ↵Dan Lake2012-01-191-20/+6
| | | | | | | | | | | | | | | | module access.
| * | | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localIDDan Lake2012-01-192-1/+12
| | | |
| * | | Fixed bugs in earlier commit on custom user parameters in Regions.iniDan Lake2012-01-191-20/+25
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-02-033-15/+44
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-033-15/+44
| |\ \ \
| | * | | D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not ↵Justin Clark-Casey (justincc)2012-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | llGetLinkNumber().
| | * | | Add llGetLinkNumberOfSides to LSL_Stub and ILSL_ApiJustin Clark-Casey (justincc)2012-02-022-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489
| | * | | Add stress tests for simple object add of 100 prim objects. Add time taken ↵Justin Clark-Casey (justincc)2012-02-021-14/+37
| | | | | | | | | | | | | | | | | | | | to output (this is unreliable).
* | | | | Merge branch 'master' into careminsterMelanie2012-02-031-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix test failureMelanie2012-02-031-0/+1
| | | | |
| * | | | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-0216-108/+197
| |/ / / | | | | | | | | | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | | | Merge branch 'master' into careminsterMelanie2012-02-021-1/+1
|\ \ \ \ | |/ / /
| * | | OpenID: server connector had a copy-and-paste error that made identity ↵Diva Canto2012-02-021-1/+1
| | | | | | | | | | | | | | | | queries fail.
* | | | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-0215-109/+188
| | | |
* | | | Streamline banning code using existing methods.Melanie2012-02-022-186/+42
| | | |
* | | | Rehook the eject and freeze events that had gotten unhooked in the mergeMelanie2012-02-021-0/+2
| | | |
* | | | Fix remembering attachment point and position when an item is rezzed in world.Melanie2012-02-023-50/+81
| | | | | | | | | | | | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root.
* | | | Merge branch 'master' into careminsterMelanie2012-02-021-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Improve reliability of script state saving by covering various savingMelanie2012-02-023-14/+28
| | |/ | |/| | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | | Improve reliability of script state saving by covering various savingMelanie2012-02-023-15/+28
| | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | | Re-Add the reading of attachment data hat was lost in the mergeMelanie2012-02-021-1/+46
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-017-43/+305
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Small optimization to last commitMelanie2012-02-011-5/+5
| | |
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-014-25/+279
| |\ \
| | * | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵Diva Canto2012-01-311-1/+1
| | | | | | | | | | | | | | | | Uri.ToString() drops the port when it's port 80.
| | * | Lay out script status in property per row format, since getting too long for ↵Justin Clark-Casey (justincc)2012-02-011-6/+12
| | | | | | | | | | | | | | | | console lines.
| | * | Add count of events queued for a particular script in "scripts show" console ↵Justin Clark-Casey (justincc)2012-02-011-4/+9
| | | | | | | | | | | | | | | | command
| | * | Make script console commands only show for selected region.Justin Clark-Casey (justincc)2012-02-011-0/+9
| | | |
| | * | Implement "xengine status" console command to show various xengine statsJustin Clark-Casey (justincc)2012-02-011-4/+28
| | | |
| | * | Add "show part uuid" and "show part name" console commands.Justin Clark-Casey (justincc)2012-01-311-7/+97
| | | | | | | | | | | | | | | | | | | | | | | | These commands will display part/prim details for a given uuid or name The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset). This is for consistency with the "delete object" commands which only delete objects, not parts.
| | * | Implement "show object name <name>" console command to show details of an ↵Justin Clark-Casey (justincc)2012-01-311-8/+49
| | | | | | | | | | | | | | | | object with the given name
| | * | Get rid of the "no objects found" feedback for now - this doesn't work well ↵Justin Clark-Casey (justincc)2012-01-311-11/+13
| | | | | | | | | | | | | | | | if a command is executed over multiple scenes.
| | * | Implement "show object uuid <uuid>" console command.Justin Clark-Casey (justincc)2012-01-312-5/+62
| | | | | | | | | | | | | | | | This will show details about a part with the given uuid if it's found.
| | * | Add more user feedback if an object isn't found for which delete was requested.Justin Clark-Casey (justincc)2012-01-311-0/+15
| | | |
| | * | Add the name of a deleted object to the console outputJustin Clark-Casey (justincc)2012-01-311-1/+1
| | | |
| | * | If a particular region is selected in the console, only try to delete ↵Justin Clark-Casey (justincc)2012-01-311-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | objects in that region, rather than in every region on the simulator The old wrong behaviour was in place before the command was extracted to a module.
| * | | Fix copy/paste errorsMelanie2012-02-012-3/+3
| | | |
| * | | Prevent a changed attachment that has been saved from being saved again.Melanie2012-02-011-0/+1
| | | |
| * | | Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-012-12/+19
| |/ / | | | | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim.
* | | Merge branch 'master' into careminsterMelanie2012-01-314-107/+208
|\ \ \ | |/ /
| * | Move object delete commands into a commands region module, in preparation ↵Justin Clark-Casey (justincc)2012-01-312-104/+206
| | | | | | | | | | | | for adding similar show commands.
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-311-2/+1
| | |
| * | Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-01-311-11/+37
|\ \ \ | | | | | | | | | | | | careminster
| * | | Draw brders around parcels for saleMelanie2012-01-311-11/+37
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-01-315-4/+150
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * | Remove scene object null check on SceneGraph.AddSceneObject(). Complain ↵Justin Clark-Casey (justincc)2012-01-311-1/+7
| | | | | | | | | | | | | | | | | | explicitly if there's an attempt to add any object with a zero UUID. Callers themselves need to check that they're not attempting to add a null scene object.