Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 5 | -0/+18 |
|\ | |||||
| * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 5 | -0/+18 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 11 | -105/+58 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | ||||
| * | minor: remove a mono compiler warning | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | |||||
| * | Print out one log message for every missing baked texture, rather than two. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -22/+4 |
| | | |||||
| * | minor: comment out "unpacked appearance" log mesasge for now | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | |||||
| * | Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | |||||
| * | Do some clean up Scene.cs log messages. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -24/+38 |
| | | | | | | | | | | This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows. This also uses m_log.*Format() which is more efficient than string concat. | ||||
| * | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 7 | -57/+16 |
| | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 6 | -16/+106 |
|\ \ | |/ | |||||
| * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 |
| | | |||||
| * | Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+5 |
| | | |||||
| * | Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+6 |
| | | | | | | | | | | | | it doesn't trigger an exception if the item hasn't been found. In this situation we will now put out a slightly more meaningful log error message instead. | ||||
| * | Add commented log lines to FetchInventoryDescendents2 path for future use. | Justin Clark-Casey (justincc) | 2011-12-09 | 3 | -4/+95 |
| | | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost | ||||
* | | Restore the Avination way of position and angle calculation so resizers | Melanie | 2011-12-09 | 1 | -5/+2 |
| | | | | | | | | work again. | ||||
* | | Set adaptive throttles false by default because it doesn't play nice with AVN | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | | | | | | | code | ||||
* | | Fix llGetLinkKey to report avatars properly | Melanie | 2011-12-09 | 1 | -19/+0 |
| | | |||||
* | | Reverse the last one | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | |||||
* | | Dummy commit | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster' into bigmerge | Melanie | 2011-12-09 | 0 | -0/+0 |
|\ \ | |||||
| * | | Fix the XMREngine not starting scripts on region startup. Turns out it | Melanie Thielker | 2010-07-25 | 1 | -5/+0 |
| | | | | | | | | | | | | was a dumb merge artefact that caused it. | ||||
| * | | Fix the XmlRpcRouterModule so it reads from the correct config section ↵ | Tom Grimshaw | 2010-07-24 | 1 | -2/+2 |
| | | | | | | | | | | | | ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default) | ||||
| * | | Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the ↵ | Tom Grimshaw | 2010-07-24 | 1 | -2/+10 |
| | | | | | | | | | | | | xmlrpc_uri event if it's not mentioned in the ini. | ||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Tom Grimshaw | 2010-07-22 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | Fix up the name of the default permissions module to match it's config name | Melanie Thielker | 2010-07-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | ... Then, make sure we also check the old-style module stack before we throw ↵ | Tom Grimshaw | 2010-07-22 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | a tantrum | ||||
| * | | | First, change DefaultPermissionsModule so it returns the correct name... | Tom Grimshaw | 2010-07-22 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Tom Grimshaw | 2010-07-22 | 4 | -27/+59 |
| |\ \ | |||||
| | * | | 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 | 3 | -5/+32 |
| | |\ \ | |||||
| | | * | | Fix the XML serializationt to provide an empty script state element if | Melanie | 2010-07-20 | 1 | -4/+28 |
| | | | | | | | | | | | | | | | | | | | | the script hasn't yet saved state, or can't save state because of a loop | ||||
| | | * | | Allow Megaregions to start properly after an unclean shutdown | Melanie | 2010-07-17 | 2 | -1/+4 |
| | | | | | |||||
| * | | | | Add config option securePermissionsLoading which will stop the region from ↵ | Tom Grimshaw | 2010-07-22 | 2 | -0/+24 |
| |/ / / | | | | | | | | | | | | | loading if the specified permissions modules fail to load. | ||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-07-17 | 24 | -223/+667 |
| |\ \ \ | | |/ / | |||||
| | * | | 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! | ||||
| | * | | extend exception catching for DoCreateChildAgentCall() from just ↵ | Justin Clark-Casey (justincc) | 2010-07-17 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | WebException to Exception on feedback from Chris Hart. See http://opensimulator.org/mantis/view.php?id=4810 | ||||
| | * | | Bug in 0.6.9 sometimes restoring script state causes region console to crash ↵ | unknown | 2010-07-17 | 1 | -39/+84 |
| | | | | | | | | | | | | | | | | due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically. | ||||
| | * | | Merge branch '0.6.9-post-fixes' of ssh://opensimulator.org/var/git/opensim ↵ | Justin Clark-Casey (justincc) | 2010-07-13 | 3 | -13/+18 |
| | |\ \ | | | | | | | | | | | | | | | | into 0.6.9-post-fixes | ||||
| | | * | | llVecNorm() now returns a zero-length vector when one is supplied as input. ↵ | dahlia | 2010-07-08 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | | | | | Addresses Mantis #4752 | ||||
| | | * | | fix a potential division by zero | dahlia | 2010-07-08 | 1 | -6/+11 |
| | | | | | |||||
| | | * | | Fix scripts in rezzed objects not starting (Mantis #4775) | Melanie | 2010-06-30 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | replace o with ; in oXmlRpcPort in OpenSim.ini.example | Justin Clark-Casey (justincc) | 2010-07-13 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | Thanks to Nebadon for the spot | ||||
| | * | | 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 | ||||
| | * | | revert group membership checking to older code pending resolution of ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | reported performance problems | ||||
| | * | | remove SimianGrid Groups OpenSim.ini.example stuff that accidentally crept ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -10/+3 |
| | | | | | | | | | | | | | | | | in through a cherry-pick | ||||
| | * | | If a script is deleted before it gets compiled, don't even bother to try | Melanie | 2010-06-09 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | compiling it | ||||
| | * | | Improve instructions for [Groups] setup in OpenSim.ini.example | Justin Clark-Casey (justincc) | 2010-06-08 | 1 | -12/+15 |
| | | | | |||||
| | * | | backport xmlrpcgroups cache from master | Justin Clark-Casey (justincc) | 2010-06-08 | 5 | -59/+112 |
| | | | |