aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Add case to Lightshare/WindlightBlueWall2011-10-221-0/+3
* | Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmergeMelanie2011-10-251-23/+21
|\ \ | |/
| * Rename some of the example commented out server names to mygridserver.com lik...Justin Clark-Casey (justincc)2011-10-221-23/+21
* | Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmergeMelanie2011-10-252-17/+19
|\ \ | |/
| * Make config comments about choosing assetcache modules clearer.Justin Clark-Casey (justincc)2011-10-222-17/+19
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-255-24/+68
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-225-24/+68
* | Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmergeMelanie2011-10-252-12/+19
|\ \ | |/
| * redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we ...Justin Clark-Casey (justincc)2011-10-222-12/+19
* | Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * correct misleading method doc on CreateNotecardAsset()Justin Clark-Casey (justincc)2011-10-221-1/+1
* | Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * in AssetHelpers, store the actual text passed in to the method, not the strin...Justin Clark-Casey (justincc)2011-10-221-2/+2
* | Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmergeMelanie2011-10-251-1/+6
|\ \ | |/
| * encode notecard assets in proper format for tests, rather than just using wha...Justin Clark-Casey (justincc)2011-10-221-1/+6
* | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-254-10/+10
|\ \ | |/
| * refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss...Justin Clark-Casey (justincc)2011-10-224-10/+10
* | Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmergeMelanie2011-10-251-21/+41
|\ \ | |/
| * RemoteAdmin - Added optional terrain loading on region create using parameter...Michelle Argus2011-10-211-21/+41
* | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmergeMelanie2011-10-251-5/+3
|\ \ | |/
| * very minor removal of old commented out line of code in OdeSceneJustin Clark-Casey (justincc)2011-10-211-5/+3
* | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmergeMelanie2011-10-251-3/+0
|\ \ | |/
| * remove unnecessary null check on _collisionEventPrimJustin Clark-Casey (justincc)2011-10-201-3/+0
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-253-25/+32
|\ \ | |/
| * Get OdeScene to use passed in time step rather than hard-coded 0.089Justin Clark-Casey (justincc)2011-10-203-25/+32
* | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmergeMelanie2011-10-251-12/+4
|\ \ | |/
| * Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Ma...Justin Clark-Casey (justincc)2011-10-201-12/+4
* | Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmergeMelanie2011-10-252-13/+5
|\ \ | |/
| * For now, stop passing timeStep into methods where it's not actually used.Justin Clark-Casey (justincc)2011-10-202-13/+5
* | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * Change wording on asset requests.Justin Clark-Casey (justincc)2011-10-191-2/+2
* | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmergeMelanie2011-10-251-5/+0
|\ \ | |/
| * Removed redundant NotInTransit function from ScenePresence. IsInTransit=false...Dan Lake2011-10-191-5/+0
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-255-318/+318
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e...Dan Lake2011-10-195-318/+318
* | Merge commit '8b20faf06c4850df800945c8135aa90c2eebe034' into bigmergeMelanie2011-10-250-0/+0
|\ \ | |/
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-192-72/+100
| |\
* | \ Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-259-344/+319
|\ \ \ | |/ /
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ...Dan Lake2011-10-199-344/+319
* | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmergeMelanie2011-10-252-41/+118
|\ \ \ | | |/ | |/|
| * | Extend scripts stop/start/suspend/resume console commands to allow action on ...Justin Clark-Casey (justincc)2011-10-192-72/+100
| |/
| * Add "scripts stop" and "scripts start" console commands.Justin Clark-Casey (justincc)2011-10-191-2/+48
| * minor: improve command help on scripts suspend/resumeJustin Clark-Casey (justincc)2011-10-191-2/+5
* | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmergeMelanie2011-10-252-22/+54
|\ \ | |/
| * Fix resume scripts.Justin Clark-Casey (justincc)2011-10-192-9/+33
* | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmergeMelanie2011-10-252-4/+52
|\ \ | |/
| * Add "scripts suspend" and "scripts resume" commands.Justin Clark-Casey (justincc)2011-10-192-3/+53
* | Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * on log and "show scripts" messages, show script item UUID rather than asset UUIDJustin Clark-Casey (justincc)2011-10-191-4/+4