Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 5 | -59/+121 | |
|\ \ \ | |/ / | ||||||
| * | | Commenting out new event until I can fix OpenSim tests. Currently, testing ↵ | Dan Lake | 2012-02-02 | 1 | -6/+6 | |
| | | | | | | | | | | | | objects does not create a Scene or EventManager so triggering events crashes some tests | |||||
| * | | OpenSim tests do not always create an EventManager so calls to trigger ↵ | Dan Lake | 2012-02-02 | 1 | -2/+6 | |
| |/ | | | | | | | events during tests must check for null EventManager | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-02 | 23 | -138/+271 | |
| |\ | ||||||
| * | | ObjectAddedToScene event should be fired when duplicating objects | Dan Lake | 2012-02-02 | 2 | -20/+22 | |
| | | | ||||||
| * | | fix line endings | Dan Lake | 2012-02-02 | 1 | -7/+7 | |
| | | | ||||||
| * | | Add event RegionHeartbeatEnd for modules interested in coordinating activity ↵ | Dan Lake | 2012-02-01 | 2 | -10/+36 | |
| | | | | | | | | | | | | with region heartbeats | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-01 | 136 | -1737/+5756 | |
| |\ \ | ||||||
| * | | | Trigger event when prims are scheduled for an update. This gives modules ↵ | Dan Lake | 2012-01-19 | 2 | -0/+28 | |
| | | | | | | | | | | | | | | | | early access to changed parameters. | |||||
| * | | | Cleaned up Color and Text parameters in SOP and made LocalFlags public for ↵ | Dan Lake | 2012-01-19 | 1 | -20/+6 | |
| | | | | | | | | | | | | | | | | module access. | |||||
| * | | | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID | Dan Lake | 2012-01-19 | 2 | -1/+12 | |
| | | | | ||||||
| * | | | Fixed bugs in earlier commit on custom user parameters in Regions.ini | Dan Lake | 2012-01-19 | 1 | -20/+25 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 3 | -15/+44 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-03 | 3 | -15/+44 | |
| |\ \ \ | ||||||
| | * | | | D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not ↵ | Justin Clark-Casey (justincc) | 2012-02-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | llGetLinkNumber(). | |||||
| | * | | | Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api | Justin Clark-Casey (justincc) | 2012-02-02 | 2 | -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-02 | 1 | -14/+37 | |
| | | | | | | | | | | | | | | | | | | | | to output (this is unreliable). | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Fix test failure | Melanie | 2012-02-03 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-02 | 0 | -0/+0 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 16 | -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 careminster | Melanie | 2012-02-02 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | OpenID: server connector had a copy-and-paste error that made identity ↵ | Diva Canto | 2012-02-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | queries fail. | |||||
* | | | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 15 | -109/+188 | |
| | | | | ||||||
* | | | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 2 | -186/+42 | |
| | | | | ||||||
* | | | | Rehook the eject and freeze events that had gotten unhooked in the merge | Melanie | 2012-02-02 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 3 | -50/+81 | |
| | | | | | | | | | | | | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-02-02 | 1 | -3/+3 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||||
| * | | | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 3 | -14/+28 | |
| | |/ | |/| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | |||||
* | | | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 3 | -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 merge | Melanie | 2012-02-02 | 1 | -1/+46 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 7 | -43/+305 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| * | | Small optimization to last commit | Melanie | 2012-02-01 | 1 | -5/+5 | |
| | | | ||||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-01 | 4 | -25/+279 | |
| |\ \ | ||||||
| | * | | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵ | Diva Canto | 2012-01-31 | 1 | -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-01 | 1 | -6/+12 | |
| | | | | | | | | | | | | | | | | console lines. | |||||
| | * | | Add count of events queued for a particular script in "scripts show" console ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+9 | |
| | | | | | | | | | | | | | | | | command | |||||
| | * | | Make script console commands only show for selected region. | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -0/+9 | |
| | | | | ||||||
| | * | | Implement "xengine status" console command to show various xengine stats | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+28 | |
| | | | | ||||||
| | * | | Add "show part uuid" and "show part name" console commands. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -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-31 | 1 | -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-31 | 1 | -11/+13 | |
| | | | | | | | | | | | | | | | | if a command is executed over multiple scenes. | |||||
| | * | | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 2 | -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-31 | 1 | -0/+15 | |
| | | | | ||||||
| | * | | Add the name of a deleted object to the console output | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | If a particular region is selected in the console, only try to delete ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -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 errors | Melanie | 2012-02-01 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | Prevent a changed attachment that has been saved from being saved again. | Melanie | 2012-02-01 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 2 | -12/+19 | |
| |/ / | | | | | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim. |