aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-057-12/+12
|\
| * Revert my two quick fixes for the lag issue and put in the real fix, whichMelanie2012-02-051-1/+2
| * Revert "Remove checks on ban list expiry on every move. To be re-added on par...Melanie2012-02-051-4/+4
| * Revert "Check ban list for a particular parcel only when an avatar moves into...Melanie2012-02-052-17/+4
| * Make configuration uniformBlueWall2012-02-051-3/+3
| * Check ban list for a particular parcel only when an avatar moves into it.Melanie2012-02-052-4/+17
| * Remove checks on ban list expiry on every move. To be re-added on parcelMelanie2012-02-051-4/+4
| * Set PhysPrimMax default to 0 so ini files won't be overriddenBlueWall2012-02-041-1/+1
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| * change NonPhysicalPrimMax to NonphysicalPrimMax to make this variablenebadon2012-02-042-2/+2
| * Make NonphysicalPrimMax setting work properlyBlueWall2012-02-041-1/+1
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
* | Merge branch 'master' into careminsterMelanie2012-02-0434-254/+561
|\ \ | |/
| * Add default value to TelehubObjectBlueWall2012-02-041-0/+10
| * Supply correct parameters to detailed authentication login fail messageJustin Clark-Casey (justincc)2012-02-041-1/+1
| * Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would eve...Justin Clark-Casey (justincc)2012-02-041-0/+2
| * Correct RC_* LSL constants used by llCastRay().Justin Clark-Casey (justincc)2012-02-041-12/+12
| * Add TestRegionSettingsDeserializeJustin Clark-Casey (justincc)2012-02-042-1/+135
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if...Justin Clark-Casey (justincc)2012-02-043-22/+21
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-0319-37/+69
| |\
| | * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-0423-146/+312
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0313-17/+50
| | | |\
| | | | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-0313-17/+50
| | | | |\
| | | | | * Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i...PixelTomsen2012-02-0313-17/+50
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0310-123/+257
| | | |\ \ \ | | | | |/ /
| | | * | | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before tri...Dan Lake2012-02-031-4/+7
| | | | |/ | | | |/|
| | * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ...Snoopy Pfeffer2012-02-035-12/+12
| * | | | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut...Justin Clark-Casey (justincc)2012-02-033-83/+58
| | |_|/ | |/| |
| * | | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ...Justin Clark-Casey (justincc)2012-02-031-14/+16
| * | | Refactor common deserialization processor code to generic method ExternalRepr...Justin Clark-Casey (justincc)2012-02-034-98/+63
| * | | Change LandDataSerializer deserialization so that in the future it won't care...Justin Clark-Casey (justincc)2012-02-036-75/+242
| |/ /
| * | Corrected console help texts for "save iar"Snoopy Pfeffer2012-02-031-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-02-035-59/+121
|\ \ \ | |/ /
| * | Commenting out new event until I can fix OpenSim tests. Currently, testing ob...Dan Lake2012-02-021-6/+6
| * | OpenSim tests do not always create an EventManager so calls to trigger events...Dan Lake2012-02-021-2/+6
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0223-138/+271
| |\
| * | ObjectAddedToScene event should be fired when duplicating objectsDan Lake2012-02-022-20/+22
| * | fix line endingsDan Lake2012-02-021-7/+7
| * | Add event RegionHeartbeatEnd for modules interested in coordinating activity ...Dan Lake2012-02-012-10/+36
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-01136-1737/+5756
| |\ \
| * | | Trigger event when prims are scheduled for an update. This gives modules earl...Dan Lake2012-01-192-0/+28
| * | | Cleaned up Color and Text parameters in SOP and made LocalFlags public for mo...Dan Lake2012-01-191-20/+6
| * | | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localIDDan Lake2012-01-192-1/+12
| * | | Fixed bugs in earlier commit on custom user parameters in Regions.iniDan Lake2012-01-191-20/+25
* | | | Merge branch 'master' into careminsterMelanie2012-02-033-15/+44
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-033-15/+44
| |\ \ \
| | * | | D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not llGetLin...Justin Clark-Casey (justincc)2012-02-021-1/+1
| | * | | Add llGetLinkNumberOfSides to LSL_Stub and ILSL_ApiJustin Clark-Casey (justincc)2012-02-022-1/+7
| | * | | Add stress tests for simple object add of 100 prim objects. Add time taken t...Justin Clark-Casey (justincc)2012-02-021-14/+37
* | | | | Merge branch 'master' into careminsterMelanie2012-02-031-0/+1
|\ \ \ \ \ | |/ / / /