Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵ | Justin Clark-Casey (justincc) | 2012-02-04 | 3 | -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/opensim | Justin Clark-Casey (justincc) | 2012-02-03 | 19 | -37/+69 |
|\ | |||||
| * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 21 | -146/+278 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-03 | 13 | -17/+50 |
| | |\ | |||||
| | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 13 | -17/+50 |
| | | |\ | |||||
| | | | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 13 | -17/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-03 | 8 | -123/+223 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵ | Dan Lake | 2012-02-03 | 1 | -4/+7 |
| | | |/ | | |/| | | | | | | | | | triggering events on a potentially null Scene | ||||
| * | | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵ | Snoopy Pfeffer | 2012-02-03 | 5 | -12/+12 |
| | | | | | | | | | | | | | | | | corresponding RemoteAdmin parameter | ||||
* | | | | Change SceneObjectSerializer to use common ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 2 | -83/+57 |
| |_|/ |/| | | | | | | | | | | | | | | 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-03 | 1 | -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 | ||||
* | | | Refactor common deserialization processor code to generic method ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 3 | -98/+62 |
| | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() | ||||
* | | | Change LandDataSerializer deserialization so that in the future it won't ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 5 | -75/+209 |
|/ / | | | | | | | | | | | care about extra elements or element order. This brings it into line with other deserializations such as object and will improve future backward compatibility. | ||||
* | | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| | | |||||
* | | 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 |
|\ | |||||
| * | 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). | ||||
| * | | Fix test failure | Melanie | 2012-02-03 | 1 | -0/+1 |
| | | | |||||
| * | | 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) | ||||
| * | OpenID: server connector had a copy-and-paste error that made identity ↵ | Diva Canto | 2012-02-02 | 1 | -1/+1 |
| | | | | | | | | queries fail. | ||||
| * | 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 | ||||
* | | 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 | 122 | -1528/+5634 |
|\ \ | |/ | |||||
| * | 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. | ||||
| * | Move object delete commands into a commands region module, in preparation ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 2 | -104/+206 |
| | | | | | | | | for adding similar show commands. | ||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -2/+1 |
| | | |||||
| * | Use Environment.TickCount & Int32.MaxValue; instead of ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -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 | ||||
| * | Remove scene object null check on SceneGraph.AddSceneObject(). Complain ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -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. |