aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-0512-79/+229
|\
| * Add "appearance rebake" command to ask a specific viewer to rebake textures f...Justin Clark-Casey (justincc)2012-01-042-4/+51
| * Separate out rebake request code from cache validation code AvatarFactoryModule.Justin Clark-Casey (justincc)2012-01-042-31/+63
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-042-0/+25
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-041-16/+4
| | |\
| | * | Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.Dan Lake2012-01-042-0/+25
| * | | Minor formatting changes and commented out log lines for future debugging of ...Justin Clark-Casey (justincc)2012-01-044-22/+80
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-041-4/+4
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-01-0343-911/+900
| | |\
| | * | Access to these static methods to serialize objects are useful outside of ser...Dan Lake2012-01-031-4/+4
| * | | Remove the pointless LLClientView.m_imageManager null check.Justin Clark-Casey (justincc)2012-01-041-16/+4
| | |/ | |/|
| * | commented out "Prevented flyoff" log message for now as this becomes problema...Justin Clark-Casey (justincc)2012-01-031-1/+1
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-038-5/+253
| |\ \
| * | | minor: add missing newlines to pCampbot usage statementJustin Clark-Casey (justincc)2012-01-031-4/+4
* | | | Small fix to GetWorldPosition to get closer to Avination sit behaviorMelanie2012-01-051-10/+4
| |/ / |/| |
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-037-84/+109
|\ \ \ | |/ /
| * | Reduce accessibility of some J2KImage/LLImageManager properties and methods t...Justin Clark-Casey (justincc)2012-01-022-12/+12
| * | Adding commented out log messages and some minor formatting for future bug hu...Justin Clark-Casey (justincc)2012-01-026-72/+97
* | | Merge branch 'new_modules'BlueWall2012-01-038-5/+253
|\ \ \ | |/ / |/| |
| * | Profile UpdatesBlueWall2012-01-038-5/+253
* | | Fix for failed http request statusBlueWall2012-01-011-14/+17
|/ /
* | Bug fix in map tiles in standalone: the map has been blank since commit 01ae9...Diva Canto2011-12-301-13/+20
* | Bring back the Hyperlinker to the Robust console. Moved the config to [GridSe...Diva Canto2011-12-301-30/+25
* | Default LocalToGrid to true. Fixes minor bug introduced yesterday where old r...Diva Canto2011-12-301-5/+1
* | Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
* | Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region...Diva Canto2011-12-297-36/+80
* | Added field LocalToGrid in UserAccount. Context: make HG work in Simian.Diva Canto2011-12-291-0/+8
* | Deleted two obsolete files in Inventory modules.Diva Canto2011-12-292-460/+0
* | Deleted unused methods from HGAssetBrokerDiva Canto2011-12-291-18/+0
* | Fixed mix-up in UserAccount fields when passing UserAccounts remotely.Diva Canto2011-12-291-1/+1
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-292-5/+13
|\ \
| * | Introduce a LightShare kill packet ans send it when needed. Currently onlyMelanie2011-12-282-5/+13
* | | HG: more adjustments for making HG Simian work. Added server_uri as new key o...Diva Canto2011-12-293-3/+7
|/ /
* | HG: more / love for XmasDiva Canto2011-12-243-6/+49
* | HG: one more adjustment with trailing /sDiva Canto2011-12-231-2/+8
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-237-37/+92
|\ \
| * | remove the old region crossing handlerMic Bowman2011-12-231-10/+0
| * | Fixes some problems with objects that attempt to cross a region boundaryMic Bowman2011-12-221-0/+24
| * | fix the UsesPhysics flag to reference the physics flag rather than the tempon...Mic Bowman2011-12-221-1/+1
| * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| * | Align default ODE_STEPSIZE with that already used through OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-12-221-2/+2
| * | rename Scene.m_physicalPrim to PhysicalPrims since its public and access exte...Justin Clark-Casey (justincc)2011-12-222-3/+3
| * | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-222-4/+2
| * | Make it possible to force all prims to be phantom via the collidable_prim boo...Justin Clark-Casey (justincc)2011-12-222-1/+13
* | | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-233-1/+6
|/ /
* | Region crossings redone: (1) removed WaitForCallback. Now that we are passing...Diva Canto2011-12-221-39/+32
* | And a typo fixMelanie2011-12-221-1/+1
* | Add a few comments, correct a merge artefactMelanie2011-12-221-1/+6
* | Harmonizing SP with AvinationMelanie2011-12-221-41/+55
* | Fixing a bug introduced yesterday. This put the precondition test inside Chec...Diva Canto2011-12-221-105/+109