aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-07-208-155/+202
|\
| * Merge branch 'ubitwork' into avinationMelanie2012-07-192-144/+184
| |\
| | * Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-192-144/+183
| | * kick gitUbitUmarov2012-07-191-0/+1
| * | Fix slow loading of task inventoryMelanie2012-07-196-11/+18
| |/
* | Merge branch 'master' into careminsterMelanie2012-07-2011-202/+272
|\ \
| * | minor: switch around mixed up circuit code and endpoint data in "show connect...Justin Clark-Casey (justincc)2012-07-191-1/+1
| * | Make LLClientView instant message handling asynchronous rather than synchrono...Justin Clark-Casey (justincc)2012-07-191-1/+1
| * | Comment out OnIncomingInstantMessage and OnInstantMessage handlers in GroupsM...Justin Clark-Casey (justincc)2012-07-191-10/+10
| * | Stop explicitly closing and nulling out Animator in order to prevent NREs in ...Justin Clark-Casey (justincc)2012-07-192-23/+7
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-07-192-3/+1
| * | Prevent race conditions between two threads that call LLClientView.Close() si...Justin Clark-Casey (justincc)2012-07-193-33/+60
| * | Add TestCreateDuplicateRootScenePresence() regression test.Justin Clark-Casey (justincc)2012-07-193-1/+41
| * | Add basic TestCreateRootScenePresence() regression testJustin Clark-Casey (justincc)2012-07-191-135/+144
* | | Merge branch 'master' into careminsterMelanie2012-07-1918-169/+247
|\ \ \ | |/ / | | / | |/ |/|
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled...Justin Clark-Casey (justincc)2012-07-198-25/+47
| * Add back notification to neighbouring regions when RegionReadyModule is not a...Justin Clark-Casey (justincc)2012-07-181-0/+3
| * Perform other region ready actions even if simulator is configured to leave l...Justin Clark-Casey (justincc)2012-07-184-47/+48
| * Stop the 15 second initial script compile wait if a script is being rezzed on...Justin Clark-Casey (justincc)2012-07-181-0/+4
| * Fix bug where region ready would be triggered a second time if a script was r...Justin Clark-Casey (justincc)2012-07-181-30/+23
| * Fix bug where region ready was being triggered twice in quick succession if a...Justin Clark-Casey (justincc)2012-07-181-9/+12
| * Establish EventManager.OnRegionReady event. This will only be triggerred onc...Justin Clark-Casey (justincc)2012-07-184-11/+39
| * Pass entire scene object in OnLoginsEnabled event rather than just the region...Justin Clark-Casey (justincc)2012-07-184-24/+22
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-181-1/+1
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-07-1813-139/+111
| | |\
| | * | Missing parameter in log error message was throwing exceptionDan Lake2012-07-181-1/+1
| * | | Only listen to LoginsEnabled event in RegionReadyModule if it has been asked ...Justin Clark-Casey (justincc)2012-07-181-26/+22
| | |/ | |/|
| * | Close() the ScenePresence after we've removed it from the scene graph, to cut...Justin Clark-Casey (justincc)2012-07-181-10/+16
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-172-6/+24
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-172-6/+24
| | |\ \
| | | * | Make the scrpt running flag work properlyMelanie2012-07-172-6/+24
| * | | | Revert "Revert "refactor: make llGiveInventory() use existing GetInventoryIte...Justin Clark-Casey (justincc)2012-07-171-24/+9
| |/ / /
| * | | Fix regression where llGiveInventory() had stopped asking non-owner receivers...Justin Clark-Casey (justincc)2012-07-173-38/+43
| * | | Revert "refactor: make llGiveInventory() use existing GetInventoryItem() meth...Justin Clark-Casey (justincc)2012-07-171-11/+24
| |/ /
| * | Restore update of inventory item on derez/logout. This is necessary to updat...Justin Clark-Casey (justincc)2012-07-171-1/+6
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-176-53/+0
| |\ \
| * | | Stop sending the viewer an inventory create message if a known attachment ite...Justin Clark-Casey (justincc)2012-07-171-4/+1
* | | | Fix llSameGroup to work according to specsMelanie2012-07-181-10/+36
* | | | Merge branch 'ubitwork' into avinationMelanie2012-07-1711-457/+393
|\ \ \ \
| * | | | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
| * | | | minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| * | | | fix our stats ( old schema )UbitUmarov2012-07-172-48/+66
| * | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-177-83/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-17353-8014/+16547
| |\ \ \ \ \ \
| * | | | | | | UbitOde: remove useless water collider from active code.UbitUmarov2012-07-171-8/+8
| * | | | | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-161-50/+35
| |\ \ \ \ \ \ \
| * | | | | | | | ** TEST ** put back corrected SetPrimParams for avatars, referenced toUbitUmarov2012-07-161-26/+48
| * | | | | | | | backkick gitUbitUmarov2012-07-151-1/+0
| * | | | | | | | just a kick gitUbitUmarov2012-07-151-0/+1