Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-06-07 | 8 | -122/+22 |
|\ | |||||
| * | Revert "commit code which stops full updates being fired multiple times when ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 8 | -121/+21 |
| | | | | | | | | | | | | | | | | attachments cross standalone region boundaries" This reverts commit 5074d290e4aeb583560272cadc8ba09aa8337210. This gets rid of the massive amount of scene object log spam - sorry about that, folks | ||||
| * | Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead. Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-05-14 | 1 | -1/+19 |
| | | | |||||
* | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-31 | 10 | -43/+177 |
|\ \ \ | |/ / | |||||
| * | | Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars. | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | This is going to be the right behaviour in all cases, I should think. This means that avatars in region when an oar is loaded do not lose their attachments | ||||
| * | | commit code which stops full updates being fired multiple times when ↵ | Justin Clark-Casey (justincc) | 2010-05-27 | 8 | -21/+121 |
| | | | | | | | | | | | | | | | | | | attachments cross standalone region boundaries lots of messy debug code here too which would need to be removed | ||||
| * | | backport from master fix for attachment display | Justin Clark-Casey (justincc) | 2010-05-24 | 3 | -3/+5 |
| | | | | | | | | | | | | this fix stops two full updates being sent on attachment rather than one. Sending two can stop the client displaying attachments properly | ||||
| * | | backport some IGroupsModule method doc and an extra exposed method from git ↵ | Justin Clark-Casey (justincc) | 2010-05-24 | 1 | -2/+31 |
| | | | | | | | | | | | | master | ||||
| * | | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | | | | | some older content | ||||
| * | | minor: correctly print out missing item id when it can't be found rather ↵ | Justin Clark-Casey (justincc) | 2010-05-20 | 1 | -1/+0 |
| | | | | | | | | | | | | than a NullReferenceException | ||||
| * | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵ | Justin Clark-Casey (justincc) | 2010-05-20 | 2 | -16/+15 |
| | | | | | | | | | | | | | | | | | | modules can use it backport from master | ||||
* | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-21 | 1 | -0/+73 |
|\ \ \ | |/ / | |||||
| * | | back port groups changes | unknown | 2010-05-05 | 1 | -0/+73 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| |/ | |||||
* | | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | some older content | ||||
* | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -50/+53 |
| | | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-05-07 | 4 | -36/+84 |
|\ \ | |||||
| * \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | sacha | 2010-05-02 | 3 | -36/+81 |
| |\ \ | |||||
| | * | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| | | | | |||||
| | * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-30 | 3 | -36/+63 |
| | |\ \ | | | |/ | |||||
| | | * | Fix link security issue | Melanie | 2010-04-30 | 3 | -36/+63 |
| | | | | |||||
| * | | | Adding DebugEvent Trap | sacha | 2010-05-02 | 1 | -0/+3 |
| |/ / | | | | | | | | | | | | | | | | | | | Adding XMREEvent Trap trapDebug("Modulename" ,"My data here ", scene); trapXMRE(int data, string Message, Scene scene); | ||||
* | | | Fix Mouse+WASD makes Av rise; Fix PREJUMP. | Kitto Flora | 2010-05-07 | 3 | -19/+19 |
|/ / | |||||
* | | Adding some more SNMP events and some refactoring | sacha | 2010-04-23 | 1 | -0/+1 |
| | | | | | | | | Signed : The Masqued Foxi | ||||
* | | Adding LinkUp/LinkDown when a region is started or stoped. | sacha | 2010-04-23 | 1 | -0/+5 |
| | | | | | | | | Those two events could be used to compute the region availibility | ||||
* | | This GetScriptErrors() change allows initial XEngine to run in background | Mike Rieker | 2010-04-18 | 1 | -6/+65 |
| | | | | | | | | | | thread. It should block only for the case of being called by CapsUpdateTaskInventoryScriptAsset(). | ||||
* | | Committing sacha's partial work (from orpheus). The GridBrat needs to learn | Melanie | 2010-04-14 | 1 | -1/+1 |
| | | | | | | | | a bit of git | ||||
* | | Change ISnmpModule to use scene references | Melanie | 2010-04-14 | 1 | -2/+9 |
| | | |||||
* | | Drop unused Alert() method from ISnmpModule | Melanie | 2010-04-13 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | lcc | 2010-04-10 | 5 | -13/+86 |
|\ \ | | | | | | | | | | | | | | | | resolved Conflicts: OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | ||||
| * | | guarantee that a script engine's GetScriptErrors() will not be called | Mike Rieker | 2010-04-10 | 3 | -12/+71 |
| | | | | | | | | | | | | | | | until after its OnRezScript() returns so that script compile error messages can be retrieved | ||||
| * | | re-fixing this darn file | lcc | 2010-04-10 | 1 | -0/+11 |
| | | | |||||
| * | | Fixing Trap | lcc | 2010-04-10 | 1 | -11/+0 |
| | | | |||||
| * | | Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, can | Melanie | 2010-04-09 | 1 | -0/+14 |
| | | | | | | | | | | | | be used to send snmp alerts | ||||
| * | | Increase the amount of time we wait for a teleport to complete. This allows ↵ | Thomas Grimshaw | 2010-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | teleportation to a remote region without a local connection to the asset server without timing out. | ||||
* | | | Adding ColdStart event | lcc | 2010-04-10 | 1 | -0/+1 |
| | | | |||||
* | | | dding this deleted file... | lcc | 2010-04-10 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2010-04-05 | 1 | -22/+26 |
|\ \ | |||||
| * | | Fix up my own shoddy code! Fixes prim rez break. Whups! | Thomas Grimshaw | 2010-04-05 | 1 | -22/+26 |
| | | | |||||
* | | | Add the ISnmpModule interface definition to Careminster release | Melanie Thielker | 2010-04-05 | 1 | -0/+11 |
|/ / | |||||
* | | Merge branch 'master' of ssh://TOR/var/git/careminster | Thomas Grimshaw | 2010-04-05 | 4 | -43/+135 |
|\ \ | |||||
| * | | Fix some overlooked merge conflicts that got committed | Melanie | 2010-04-05 | 1 | -10/+0 |
| | | | |||||
| * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 4 | -42/+144 |
| |\ \ | | |/ | |||||
| | * | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-09 | 4 | -43/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head. | ||||
* | | | This commit adds some randomness to object persistence. It's a Work In ↵ | Thomas Grimshaw | 2010-04-05 | 1 | -4/+42 |
| | | | | | | | | | | | | Progress, I am working on improving this to a tiered approach. | ||||
* | | | Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 ↵ | Thomas Grimshaw | 2010-04-05 | 1 | -1/+9 |
|/ / | | | | | | | so it can be reverted then. | ||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-03-19 | 2 | -26/+10 |
|\ \ | |||||
| * | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 2 | -26/+10 |
| | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
* | | | Fix sit with autopilot. | Kitto Flora | 2010-03-19 | 1 | -3/+5 |
|/ / |