aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-1210-266/+184
|\
| * Merge branch 'master' into careminsterMelanie2011-12-1210-266/+184
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵Dan Lake2011-12-126-50/+57
| | | | | | | | | | | | IsColliding
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-12-123-191/+72
| | |\
| | | * Mantis 5816: osParseJSON Decoding Problemsnebadon2011-12-113-191/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | osParseJSON uses hand-crafted decoding that has two issues * does not seem to handle top-level JSON lists * does not seem to handle unicode text thanks otakup0pe!
| | * | Added an option for extra settings within region ini file. Any non-hardcoded ↵Dan Lake2011-12-121-20/+55
| | |/ | | | | | | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
* | | Send changed animation event asynchronouslyMelanie2011-12-121-14/+17
|/ /
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-102-14/+7
| |
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-102-119/+143
| |
* | Merge branch 'master' into careminsterMelanie2011-12-105-0/+18
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-105-0/+18
| |
* | Merge branch 'master' into careminsterMelanie2011-12-1011-105/+58
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * minor: remove a mono compiler warningJustin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Print out one log message for every missing baked texture, rather than two.Justin Clark-Casey (justincc)2011-12-091-22/+4
| |
| * minor: comment out "unpacked appearance" log mesasge for nowJustin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.Justin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-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-097-57/+16
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into careminsterMelanie2011-12-096-16/+106
|\ \ | |/
| * remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
| |
| * Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)2011-12-091-4/+5
| |
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵Justin Clark-Casey (justincc)2011-12-091-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-093-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 resizersMelanie2011-12-091-5/+2
| | | | | | | | work again.
* | Set adaptive throttles false by default because it doesn't play nice with AVNMelanie2011-12-091-1/+1
| | | | | | | | code
* | Fix llGetLinkKey to report avatars properlyMelanie2011-12-091-19/+0
| |
* | Reverse the last oneMelanie2011-12-091-1/+1
| |
* | Dummy commitMelanie2011-12-091-1/+1
| |
* | Merge branch 'careminster' into bigmergeMelanie2011-12-090-0/+0
|\ \
| * | Fix the XMREngine not starting scripts on region startup. Turns out itMelanie Thielker2010-07-251-5/+0
| | | | | | | | | | | | was a dumb merge artefact that caused it.
| * | Fix the XmlRpcRouterModule so it reads from the correct config section ↵Tom Grimshaw2010-07-241-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 Grimshaw2010-07-241-2/+10
| | | | | | | | | | | | xmlrpc_uri event if it's not mentioned in the ini.
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterTom Grimshaw2010-07-220-0/+0
| |\ \
| | * | Fix up the name of the default permissions module to match it's config nameMelanie Thielker2010-07-231-1/+1
| | | |
| * | | ... Then, make sure we also check the old-style module stack before we throw ↵Tom Grimshaw2010-07-221-2/+13
| | | | | | | | | | | | | | | | a tantrum
| * | | First, change DefaultPermissionsModule so it returns the correct name...Tom Grimshaw2010-07-221-1/+1
| |/ /
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterTom Grimshaw2010-07-224-27/+59
| |\ \
| | * | Allow megaregions to be used in M7, should we so decideMelanie Thielker2010-07-212-22/+27
| | | |
| | * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-07-213-5/+32
| | |\ \
| | | * | Fix the XML serializationt to provide an empty script state element ifMelanie2010-07-201-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 shutdownMelanie2010-07-172-1/+4
| | | | |
| * | | | Add config option securePermissionsLoading which will stop the region from ↵Tom Grimshaw2010-07-222-0/+24
| |/ / / | | | | | | | | | | | | loading if the specified permissions modules fail to load.
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-07-1724-223/+667
| |\ \ \ | | |/ /
| | * | Stop occasional permanently high 100% utilization when the server is started ↵Justin Clark-Casey (justincc)2010-07-171-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-171-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 ↵unknown2010-07-171-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-133-13/+18
| | |\ \ | | | | | | | | | | | | | | | into 0.6.9-post-fixes
| | | * | llVecNorm() now returns a zero-length vector when one is supplied as input. ↵dahlia2010-07-081-7/+2
| | | | | | | | | | | | | | | | | | | | Addresses Mantis #4752
| | | * | fix a potential division by zerodahlia2010-07-081-6/+11
| | | | |
| | | * | Fix scripts in rezzed objects not starting (Mantis #4775)Melanie2010-06-301-0/+5
| | | | |
generated by cgit v1.1 at 2024-12-24 09:55:40 +0000