aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-2427-682/+889
|\
| * Append asset ID to URL for storage requests to allow caching proxies to work ...Dan Lake2011-11-231-1/+3
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-2311-27/+231
| |\
| | * Print out what behaviours are active when pCampBot starts upJustin Clark-Casey (justincc)2011-11-235-12/+42
| | * Add teleport behaviour to pCampBotJustin Clark-Casey (justincc)2011-11-233-1/+77
| | * In pCampbot, change "show status" command to "show bots"Justin Clark-Casey (justincc)2011-11-231-2/+2
| | * Rename Bot.BotManager to ManagerJustin Clark-Casey (justincc)2011-11-231-9/+16
| | * get pCampBot to extract nearby and store nearby region informationJustin Clark-Casey (justincc)2011-11-232-4/+62
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-234-3/+30
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-11-2311-293/+288
| | | |\
| | | * | Shell Environment Variables in configBlueWall2011-11-234-3/+30
| | * | | Change random number generator property name in pCampbotJustin Clark-Casey (justincc)2011-11-231-1/+7
| | | |/ | | |/|
| * | | Line endingsDan Lake2011-11-231-101/+101
| |/ /
| * | Log error if we attempt to add/remove an OdeCharacter from the _characters li...Justin Clark-Casey (justincc)2011-11-221-23/+33
| * | Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since th...Justin Clark-Casey (justincc)2011-11-221-6/+1
| * | Comment out uncalled OdeScene.UnCombine()Justin Clark-Casey (justincc)2011-11-222-66/+60
| * | Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()Justin Clark-Casey (justincc)2011-11-221-27/+27
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-221-1/+1
| * | Stop an exception being thrown and a teleport/border cross failing if the des...Justin Clark-Casey (justincc)2011-11-225-32/+41
| * | slightly simplify OdeScene.Simulate() by removing bool processtaints, since w...Justin Clark-Casey (justincc)2011-11-223-141/+128
| |/
| * Improve the error messages returned if the HelloNeighbour call fails.Justin Clark-Casey (justincc)2011-11-211-19/+46
| * Slightly improve "Unable to space collide" logging message, though I don't th...Justin Clark-Casey (justincc)2011-11-211-1/+2
| * Get rid of OdeCharacter != null checks since OdeScene._characters can never c...Justin Clark-Casey (justincc)2011-11-211-17/+4
| * remove unnecessary OdeScene._activeprims locking. Code is single-threadedJustin Clark-Casey (justincc)2011-11-211-53/+46
| * Restore defects list. In hindsight, the reason for this is becuase we can't ...Justin Clark-Casey (justincc)2011-11-212-92/+112
| * simplify operation of OdeScene._perloopContactJustin Clark-Casey (justincc)2011-11-211-45/+51
| * don't bother locking OdeScene._perloopContact in single threaded codeJustin Clark-Casey (justincc)2011-11-211-47/+42
| * don't lock OdeScene.contacts since only ever accessed by a single threadJustin Clark-Casey (justincc)2011-11-211-10/+24
| * rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to m...Justin Clark-Casey (justincc)2011-11-211-8/+10
| * refactor: Eliminate one line ODECharacter.doForce() method for code clarityJustin Clark-Casey (justincc)2011-11-211-15/+3
| * Comment out calls to OdeScene.waitForSpaceUnlock() since that method does not...Justin Clark-Casey (justincc)2011-11-213-23/+24
| * Reduce complexity of OdeScene.Simulate() by fully removing bad characters at ...Justin Clark-Casey (justincc)2011-11-212-70/+29
| * move geom/actor map maintenance into DestroyODEStructures()/AvatarGeomAndBody...Justin Clark-Casey (justincc)2011-11-212-10/+9
| * When changing avatar size in ODE, remove the old actor from the name and acto...Justin Clark-Casey (justincc)2011-11-212-8/+14
| * When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove ...Justin Clark-Casey (justincc)2011-11-212-10/+23
| * Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaini...Justin Clark-Casey (justincc)2011-11-213-9/+14
| * Actually remove PhysicsActor.SOPDescription this timeJustin Clark-Casey (justincc)2011-11-211-1/+3
| * Chain SOP constructors together rather than having copy/paste codeJustin Clark-Casey (justincc)2011-11-211-14/+5
| * refactor: Make SOP.Description an automatic propertyJustin Clark-Casey (justincc)2011-11-211-6/+3
| * Remove unused PhysicsActor.SOPDescriptionJustin Clark-Casey (justincc)2011-11-211-11/+2
| * Instead of generating a new list for bad characters on every physics pass, ke...Justin Clark-Casey (justincc)2011-11-211-3/+12
| * Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in OpenSim.ini...Justin Clark-Casey (justincc)2011-11-211-7/+7
* | Merge branch 'master' into bigmergeMelanie2011-11-1926-5565/+5647
|\ \ | |/
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre...Justin Clark-Casey (justincc)2011-11-192-3/+2
| * minor: Make HelloNeighbour messages more informativeJustin Clark-Casey (justincc)2011-11-191-5/+10
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff...Justin Clark-Casey (justincc)2011-11-196-10/+13
| * Enable v2/v3 map tile url setting on robust as default in configJustin Clark-Casey (justincc)2011-11-192-2/+2
| * Remove mono compiler warnings. Fix problem with co-ordinate given in deregis...Justin Clark-Casey (justincc)2011-11-193-9/+9
| * Improve some grid region log messages to express regions at co-ordinate (e.g....Justin Clark-Casey (justincc)2011-11-195-13/+50
| * improve region deregistration log messageJustin Clark-Casey (justincc)2011-11-191-1/+4
generated by cgit v1.1 at 2024-10-21 02:03:09 +0000