Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow megaregions to be used in M7, should we so decide | Melanie Thielker | 2010-07-21 | 2 | -22/+27 |
| | |||||
* | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-07-21 | 2 | -1/+4 |
|\ | |||||
| * | Allow Megaregions to start properly after an unclean shutdown | Melanie | 2010-07-17 | 2 | -1/+4 |
| | | |||||
* | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-07-17 | 12 | -33/+169 |
|\ \ | |/ | |||||
| * | Stop occasional permanently high 100% utilization when the server is started ↵ | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | with many scripts See http://opensimulator.org/mantis/view.php?id=4799 for more details This is the equivalent patch that was applied to master 3.5 weeks ago, seemingly without bad consequences Thanks Snoopy! | ||||
| * | If an emergency pos is required for a new root agent, correctly preserve the ↵ | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
| | | | | | | | | | | | | z co-ord instead of accidentally resetting the incorrect x co-ord This is a one-liner. It has already been addressed in master and 0.7-post-fixes in a more extensive way | ||||
| * | Revert "stop exceptions in setting and getting state from propogating since ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -31/+8 |
| | | | | | | | | | | | | | | | | they aren't fatal to operations" This reverts commit ae2454821628d847b0add20a4c593162baafde5b. Reverted for now pending a fix to the underlying xengine problem instead. | ||||
| * | stop exceptions in setting and getting state from propogating since they ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -8/+31 |
| | | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt | ||||
| * | backport xmlrpcgroups cache from master | Justin Clark-Casey (justincc) | 2010-06-08 | 2 | -4/+5 |
| | | |||||
| * | remove references to OpenSim.Framework.Commuications.Tests.dll since all ↵ | Justin Clark-Casey (justincc) | 2010-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | relevant test code has been obsoleted this allows the tests to pass on my local system | ||||
| * | Merge branch '0.6.9-post-fixes' into share-with-group | Justin Clark-Casey (justincc) | 2010-06-08 | 9 | -29/+152 |
| |\ | |||||
| | * | minor: remove some commented out code and return ↵ | Justin Clark-Casey (justincc) | 2010-06-07 | 2 | -7/+1 |
| | | | | | | | | | | | | ScenePresence.UpdatePriority() to private | ||||
| | * | Stop some hud components disappearing on region crossings | Justin Clark-Casey (justincc) | 2010-06-07 | 2 | -5/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | If viewers (or at least, Linden Viewer 1.23.5) receive child hud object updates before the root prim, then the children are not displayed. Updates were being queued in LLClientView in the right order (root first) but were being sent in a random order since they were all at the same prioritization This commit prioritizes the root prim of a hud to its highest level when queued. I'm not sure if the periodic reprioritization triggered via ScenePresence might reset this, but boosting priority appears to work so far. Also committed is a belt and braces mechanism in LLClientView to prevent child hud prim being sent out before their root, but since this doesn't appear to be needed it is currently commented out. | ||||
| | * | reapply fix for double sending of attachment update on standalone region ↵ | Justin Clark-Casey (justincc) | 2010-06-07 | 8 | -47/+47 |
| | | | | | | | | | | | | crossing | ||||
| | * | commit code which stops full updates being fired multiple times when ↵ | Justin Clark-Casey (justincc) | 2010-06-07 | 8 | -21/+121 |
| | | | | | | | | | | | | | | | | | | attachments cross standalone region boundaries lots of messy debug code here too which would need to be removed | ||||
| * | | Partially implement share with group option for object inventory items | Justin Clark-Casey (justincc) | 2010-05-26 | 3 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off. If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active. However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway Resolve conflict in LLClientView | ||||
* | | | 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 |
| | | |